Skip to content

P
python-poetry
Commit 1e70d05b by Sébastien Eustace Committed by Sébastien Eustace
Options

Fix dependency resolution debug on Python <3.5

parent dcc8ac5a
Showing with 48 additions and 17 deletions
poetry/puzzle/provider.py
...@@ -409,7 +409,11 @@ class Provider: ...@@ -409,7 +409,11 @@ class Provider:
continue continue
if len(by_constraint) == 1: if len(by_constraint) == 1:
self.debug("Merging requirements for {}".format(str(deps[0]))) self.debug(
"<debug>Merging requirements for {}</debug>".format(
str(deps[0])
)
)
dependencies.append(list(by_constraint.values())[0][0]) dependencies.append(list(by_constraint.values())[0][0])
continue continue
...@@ -470,11 +474,20 @@ class Provider: ...@@ -470,11 +474,20 @@ class Provider:
def debug(self, message, depth=0): def debug(self, message, depth=0):
if message.startswith("fact:"): if message.startswith("fact:"):
if "depends on" in message: if "depends on" in message:
message = re.sub( m = re.match("fact: (.+?) depends on (.+?) \((.+?)\)", message)
"fact: (.+?)(?:( \()(.+?)(\)))? depends on (.+?) \((.+?)\)", m2 = re.match("(.+?) \((.+?)\)", m.group(1))
"<fg=blue>fact</>: <info>\\1</info>\\2<comment>\\3</comment>\\4 " if m2:
"depends on <info>\\5</info> (<comment>\\6</comment>)", name = m2.group(1)
message, version = " (<comment>{}</comment>)".format(m2.group(2))
else:
name = m.group(1)
version = ""
message = (
"<fg=blue>fact</>: <info>{}</info>{} "
"depends on <info>{}</info> (<comment>{}</comment>)".format(
name, version, m.group(2), m.group(3)
)
) )
else: else:
message = re.sub( message = re.sub(
...@@ -489,18 +502,36 @@ class Provider: ...@@ -489,18 +502,36 @@ class Provider:
message, message,
) )
elif message.startswith("derived:"): elif message.startswith("derived:"):
message = re.sub( m = re.match("derived: (.+?) \((.+?)\)$", message)
"derived: (.+?)(?:( \()(.+?)(\)))?$", if m:
"<fg=blue>derived</>: <info>\\1</info>\\2<comment>\\3</comment>\\4", message = "<fg=blue>derived</>: <info>{}</info> (<comment>{}</comment>)".format(
message, m.group(1), m.group(2)
) )
else:
message = "<fg=blue>derived</>: <info>{}</info>".format(
message.split("derived: ")[1]
)
elif message.startswith("conflict:"): elif message.startswith("conflict:"):
message = re.sub( m = re.match("conflict: (.+?) depends on (.+?) \((.+?)\)", message)
"conflict: (.+?)(?:( \()(.+?)(\)))? depends on (.+?) \((.+?)\)", if m:
"<fg=red;options=bold>conflict</>: <info>\\1</info>\\2<comment>\\3</comment>\\4 " m2 = re.match("(.+?) \((.+?)\)", m.group(1))
"depends on <info>\\5</info> (<comment>\\6</comment>)", if m2:
message, name = m2.group(1)
) version = " (<comment>{}</comment>)".format(m2.group(2))
else:
name = m.group(1)
version = ""
message = (
"<fg=red;options=bold>conflict</>: <info>{}</info>{} "
"depends on <info>{}</info> (<comment>{}</comment>)".format(
name, version, m.group(2), m.group(3)
)
)
else:
message = "<fg=red;options=bold>conflict</>: {}".format(
message.split("conflict: ")[1]
)
message = message.replace("! ", "<error>!</error> ") message = message.replace("! ", "<error>!</error> ")
......
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