diff --git a/poetry/console/commands/install.py b/poetry/console/commands/install.py index 82585afe96f..8a820c3d585 100644 --- a/poetry/console/commands/install.py +++ b/poetry/console/commands/install.py @@ -77,7 +77,7 @@ def handle(self): return 0 self.line( - " - Installing {} ({})".format( + " - Installing {} ({})".format( self.poetry.package.pretty_name, self.poetry.package.pretty_version ) ) diff --git a/poetry/console/config/application_config.py b/poetry/console/config/application_config.py index 97570956b09..e8f752752fd 100644 --- a/poetry/console/config/application_config.py +++ b/poetry/console/config/application_config.py @@ -36,11 +36,12 @@ def configure(self): super(ApplicationConfig, self).configure() self.add_style(Style("c1").fg("cyan")) + self.add_style(Style("c2").fg("green")) self.add_style(Style("info").fg("blue")) self.add_style(Style("comment").fg("green")) self.add_style(Style("error").fg("red").bold()) - self.add_style(Style("warning").fg("yellow")) - self.add_style(Style("debug").fg("black").bold()) + self.add_style(Style("warning").fg("yellow").bold()) + self.add_style(Style("debug").fg("default").dark()) self.add_event_listener(PRE_HANDLE, self.register_command_loggers) self.add_event_listener(PRE_HANDLE, self.set_env) diff --git a/poetry/installation/installer.py b/poetry/installation/installer.py index f506e111949..66cb03373fb 100644 --- a/poetry/installation/installer.py +++ b/poetry/installation/installer.py @@ -305,7 +305,7 @@ def _execute_install(self, operation): # type: (Install) -> None if operation.skipped: if self.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.write_line( - " - Skipping {} ({}) {}".format( + " - Skipping {} ({}) {}".format( operation.package.pretty_name, operation.package.full_pretty_version, operation.skip_reason, @@ -316,7 +316,7 @@ def _execute_install(self, operation): # type: (Install) -> None if self._execute_operations or self.is_dry_run(): self._io.write_line( - " - Installing {} ({})".format( + " - Installing {} ({})".format( operation.package.pretty_name, operation.package.full_pretty_version ) ) @@ -333,7 +333,7 @@ def _execute_update(self, operation): # type: (Update) -> None if operation.skipped: if self.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.write_line( - " - Skipping {} ({}) {}".format( + " - Skipping {} ({}) {}".format( target.pretty_name, target.full_pretty_version, operation.skip_reason, @@ -344,7 +344,7 @@ def _execute_update(self, operation): # type: (Update) -> None if self._execute_operations or self.is_dry_run(): self._io.write_line( - " - Updating {} ({} -> {})".format( + " - Updating {} ({} -> {})".format( target.pretty_name, source.full_pretty_version, target.full_pretty_version, @@ -360,7 +360,7 @@ def _execute_uninstall(self, operation): # type: (Uninstall) -> None if operation.skipped: if self.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.write_line( - " - Not removing {} ({}) {}".format( + " - Not removing {} ({}) {}".format( operation.package.pretty_name, operation.package.full_pretty_version, operation.skip_reason, @@ -371,7 +371,7 @@ def _execute_uninstall(self, operation): # type: (Uninstall) -> None if self._execute_operations or self.is_dry_run(): self._io.write_line( - " - Removing {} ({})".format( + " - Removing {} ({})".format( operation.package.pretty_name, operation.package.full_pretty_version ) ) diff --git a/poetry/puzzle/provider.py b/poetry/puzzle/provider.py index fa87f2ef09f..ea42a088c95 100644 --- a/poetry/puzzle/provider.py +++ b/poetry/puzzle/provider.py @@ -731,31 +731,31 @@ def debug(self, message, depth=0): message = ( "fact: {}{} " - "depends on {} ({})".format( + "depends on {} ({})".format( name, version, m.group(2), m.group(3) ) ) elif " is " in message: message = re.sub( "fact: (.+) is (.+)", - "fact: \\1 is \\2", + "fact: \\1 is \\2", message, ) else: message = re.sub( - r"(?<=: )(.+?) \((.+?)\)", "\\1 (\\2)", message + r"(?<=: )(.+?) \((.+?)\)", "\\1 (\\2)", message ) message = "fact: {}".format(message.split("fact: ")[1]) elif message.startswith("selecting "): message = re.sub( r"selecting (.+?) \((.+?)\)", - "selecting \\1 (\\2)", + "selecting \\1 (\\2)", message, ) elif message.startswith("derived:"): m = re.match(r"derived: (.+?) \((.+?)\)$", message) if m: - message = "derived: {} ({})".format( + message = "derived: {} ({})".format( m.group(1), m.group(2) ) else: @@ -768,14 +768,14 @@ def debug(self, message, depth=0): m2 = re.match(r"(.+?) \((.+?)\)", m.group(1)) if m2: name = m2.group(1) - version = " ({})".format(m2.group(2)) + version = " ({})".format(m2.group(2)) else: name = m.group(1) version = "" message = ( "conflict: {}{} " - "depends on {} ({})".format( + "depends on {} ({})".format( name, version, m.group(2), m.group(3) ) ) @@ -791,7 +791,7 @@ def debug(self, message, depth=0): debug_info = ( "\n".join( [ - "{}: {}".format(str(depth).rjust(4), s) + "{}: {}".format(str(depth).rjust(4), s) for s in debug_info.split("\n") ] ) @@ -806,9 +806,7 @@ def progress(self): self._io.write_line("Resolving dependencies...") yield else: - indicator = Indicator( - self._io, "{message} ({elapsed:2s})" - ) + indicator = Indicator(self._io, "{message} ({elapsed:2s})") with indicator.auto( "Resolving dependencies...", diff --git a/poetry/repositories/pypi_repository.py b/poetry/repositories/pypi_repository.py index 76b37daf5bb..e110da77879 100644 --- a/poetry/repositories/pypi_repository.py +++ b/poetry/repositories/pypi_repository.py @@ -503,4 +503,4 @@ def _download(self, url, dest): # type: (str, str) -> None f.write(chunk) def _log(self, msg, level="info"): - getattr(logger, level)("{}: {}".format(self._name, msg)) + getattr(logger, level)("{}: {}".format(self._name, msg))