Commit 5f2d2b86 by Randy Döring Committed by Bjorn Neergaard

locker: always use base_pep_508_name (for any constraint base_pep_508_name is equal to pretty_name)

parent 9fb6c95d
...@@ -410,12 +410,7 @@ class Locker: ...@@ -410,12 +410,7 @@ class Locker:
if package.extras: if package.extras:
extras = {} extras = {}
for name, deps in sorted(package.extras.items()): for name, deps in sorted(package.extras.items()):
# TODO: This should use dep.to_pep_508() once this is fixed extras[name] = sorted(dep.base_pep_508_name for dep in deps)
# https://github.com/python-poetry/poetry-core/pull/102
extras[name] = sorted(
dep.base_pep_508_name if not dep.constraint.is_any() else dep.name
for dep in deps
)
data["extras"] = extras data["extras"] = extras
......
...@@ -11,7 +11,7 @@ python-versions = "*" ...@@ -11,7 +11,7 @@ python-versions = "*"
"C" = {version = "^1.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""} "C" = {version = "^1.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
[package.extras] [package.extras]
foo = ["b"] foo = ["B"]
[[package]] [[package]]
name = "B" name = "B"
......
...@@ -7,9 +7,9 @@ optional = false ...@@ -7,9 +7,9 @@ optional = false
python-versions = "*" python-versions = "*"
[package.extras] [package.extras]
dev = ["coverage", "hypothesis", "pympler", "pytest", "six", "sphinx", "zope-interface", "zope-interface"] dev = ["coverage", "hypothesis", "pympler", "pytest", "six", "sphinx", "zope.interface", "zope.interface"]
docs = ["sphinx", "zope-interface"] docs = ["sphinx", "zope.interface"]
tests = ["coverage", "hypothesis", "pympler", "pytest", "six", "zope-interface"] tests = ["coverage", "hypothesis", "pympler", "pytest", "six", "zope.interface"]
[[package]] [[package]]
name = "colorama" name = "colorama"
......
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