Commit 5484122c by Sébastien Eustace

Display logging messages from poetry-core when building

parent 2ba36c82
...@@ -13,6 +13,7 @@ class BuildCommand(EnvCommand): ...@@ -13,6 +13,7 @@ class BuildCommand(EnvCommand):
] ]
loggers = [ loggers = [
"poetry.core.masonry.builders.builder",
"poetry.core.masonry.builders.sdist", "poetry.core.masonry.builders.sdist",
"poetry.core.masonry.builders.wheel", "poetry.core.masonry.builders.wheel",
] ]
......
...@@ -90,6 +90,11 @@ class ApplicationConfig(BaseApplicationConfig): ...@@ -90,6 +90,11 @@ class ApplicationConfig(BaseApplicationConfig):
logger.handlers = [handler] logger.handlers = [handler]
level = logging.WARNING level = logging.WARNING
# The builders loggers are special and we can actually
# start at the INFO level.
if logger.name.startswith("poetry.core.masonry.builders"):
level = logging.INFO
if io.is_debug(): if io.is_debug():
level = logging.DEBUG level = logging.DEBUG
elif io.is_very_verbose() or io.is_verbose(): elif io.is_very_verbose() or io.is_verbose():
......
...@@ -2,6 +2,7 @@ from .builder_formatter import BuilderLogFormatter ...@@ -2,6 +2,7 @@ from .builder_formatter import BuilderLogFormatter
FORMATTERS = { FORMATTERS = {
"poetry.core.masonry.builders.builder": BuilderLogFormatter(),
"poetry.core.masonry.builders.sdist": BuilderLogFormatter(), "poetry.core.masonry.builders.sdist": BuilderLogFormatter(),
"poetry.core.masonry.builders.wheel": BuilderLogFormatter(), "poetry.core.masonry.builders.wheel": BuilderLogFormatter(),
} }
...@@ -5,9 +5,17 @@ from .formatter import Formatter ...@@ -5,9 +5,17 @@ from .formatter import Formatter
class BuilderLogFormatter(Formatter): class BuilderLogFormatter(Formatter):
def format(self, msg): # type: (str) -> str def format(self, msg): # type: (str) -> str
if msg.startswith(" - Building ") or msg.startswith(" - Built "): if msg.startswith("Building "):
msg = re.sub(r" - (Buil(?:t|ing)) (.+)", " - \\1 <c2>\\2</c2>", msg) msg = re.sub("Building (.+)", " - Building <info>\\1</info>", msg)
elif msg.startswith(" - Adding: "): elif msg.startswith("Built "):
msg = re.sub(r" - Adding: (.+)", " - Adding: <b>\\1</b>", msg) msg = re.sub("Built (.+)", " - Built <success>\\1</success>", msg)
elif msg.startswith("Adding: "):
msg = re.sub("Adding: (.+)", " - Adding: <b>\\1</b>", msg)
elif msg.startswith("Executing build script: "):
msg = re.sub(
"Executing build script: (.+)",
" - Executing build script: <b>\\1</b>",
msg,
)
return msg return msg
...@@ -5,13 +5,7 @@ class IOHandler(logging.Handler): ...@@ -5,13 +5,7 @@ class IOHandler(logging.Handler):
def __init__(self, io): def __init__(self, io):
self._io = io self._io = io
level = logging.WARNING super(IOHandler, self).__init__()
if io.is_debug():
level = logging.DEBUG
elif io.is_very_verbose() or io.is_verbose():
level = logging.INFO
super(IOHandler, self).__init__(level)
def emit(self, record): def emit(self, record):
try: try:
......
...@@ -24,7 +24,7 @@ classifiers = [ ...@@ -24,7 +24,7 @@ classifiers = [
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "~2.7 || ^3.5" python = "~2.7 || ^3.5"
poetry-core = "^1.0.0a8" poetry-core = "^1.0.0a9"
cleo = "^0.8.1" cleo = "^0.8.1"
clikit = "^0.6.2" clikit = "^0.6.2"
crashtest = { version = "^0.3.0", python = "^3.6" } crashtest = { version = "^0.3.0", python = "^3.6" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment