Skip to content

P
python-poetry
Commit f50ff8d9 by Sébastien Eustace
Options

Truly fix a bug where dependencies constraints were too strict in lock

parent 1c66807b
Showing with 161 additions and 79 deletions
poetry/puzzle/solver.py
...@@ -47,53 +47,20 @@ class Solver: ...@@ -47,53 +47,20 @@ class Solver:
# Setting info # Setting info
for vertex in graph.vertices.values(): for vertex in graph.vertices.values():
tags = self._get_tags_for_vertex(vertex, requested) category, optional, python, platform = self._get_tags_for_vertex(
if 'main' in tags['category']: vertex, requested
vertex.payload.category = 'main' )
else:
vertex.payload.category = 'dev'
if not tags['optional']:
vertex.payload.optional = False
else:
vertex.payload.optional = True
# Finding the less restrictive requirements
requirements = {}
parser = VersionParser()
for req_name, reqs in tags['requirements'].items():
for req in reqs:
if req_name == 'python':
if 'python' not in requirements:
requirements['python'] = req
continue
previous = parser.parse_constraints(
requirements['python']
)
current = parser.parse_constraints(req)
if current.matches(previous):
requirements['python'] = req
elif req_name == 'platform':
if 'platform' not in requirements:
requirements['platform'] = req
continue
previous = GenericConstraint.parse(
requirements['platform']
)
current = GenericConstraint.parse(req)
if current.matches(previous): vertex.payload.category = category
requirements['platform'] = req vertex.payload.optional = optional
# If requirements are empty, drop them # If requirements are empty, drop them
if 'python' in requirements and requirements['python'] == '*': requirements = {}
del requirements['python'] if python is not None and python != '*':
requirements['python'] = python
if 'platform' in requirements and requirements['platform'] == '*': if platform is not None and platform != '*':
del requirements['platform'] requirements['platform'] = platform
vertex.payload.requirements = requirements vertex.payload.requirements = requirements
...@@ -147,45 +114,110 @@ class Solver: ...@@ -147,45 +114,110 @@ class Solver:
) )
) )
def _get_tags_for_vertex(self, vertex, requested, original=None): def _get_tags_for_vertex(self, vertex, requested):
tags = { category = 'dev'
'category': [], optional = True
'optional': True, python_version = None
'requirements': { platform = None
'python': [],
'platform': []
}
}
if not vertex.incoming_edges: if not vertex.incoming_edges:
# Original dependency # Original dependency
for req in requested: for req in requested:
if req.name == vertex.name: if vertex.payload.name == req.name:
tags['category'].append(req.category) category = req.category
if not req.is_optional(): optional = req.is_optional()
tags['optional'] = False
if req.python_versions != '*': python_version = str(req.python_constraint)
tags['requirements']['python'].append(str(req.python_constraint))
if req.platform != '*': platform = str(req.platform_constraint)
tags['requirements']['platform'].append(str(req.platform_constraint))
break break
else:
for edge in vertex.incoming_edges:
for req in edge.origin.payload.requires:
if req.name == vertex.payload.name:
tags['requirements']['python'].append(req.python_versions)
tags['requirements']['platform'].append(req.platform) return category, optional, python_version, platform
parser = VersionParser()
python_versions = []
platforms = []
for edge in vertex.incoming_edges:
python_version = None
platform = None
for req in edge.origin.payload.requires:
if req.name == vertex.payload.name:
python_version = req.python_versions
platform = req.platform
sub_tags = self._get_tags_for_vertex(edge.origin, requested) break
(top_category,
top_optional,
top_python_version,
top_platform) = self._get_tags_for_vertex(
edge.origin, requested
)
if top_category == 'main':
category = top_category
optional = optional and top_optional
tags['category'] += sub_tags['category'] # Take the most restrictive constraints
tags['optional'] = tags['optional'] and sub_tags['optional'] if top_python_version is not None:
requirements = sub_tags['requirements'] if python_version is not None:
tags['requirements']['python'] += requirements.get('python', []) previous = parser.parse_constraints(python_version)
tags['requirements']['platform'] += requirements.get('platform', []) current = parser.parse_constraints(top_python_version)
return tags if top_python_version != '*' and previous.matches(current):
python_versions.append(top_python_version)
else:
python_versions.append(python_version)
else:
python_versions.append(top_python_version)
elif python_version is not None:
python_versions.append(python_version)
if top_platform is not None:
if platform is not None:
previous = GenericConstraint.parse(platform)
current = GenericConstraint.parse(top_platform)
if top_platform != '*' and previous.matches(current):
platforms.append(top_platform)
else:
platforms.append(platform)
else:
platforms.append(top_platform)
elif platform is not None:
platforms.append(platform)
if not python_versions:
python_version = None
else:
# Find the least restrictive constraint
python_version = python_versions[0]
previous = parser.parse_constraints(python_version)
for constraint in python_versions[1:]:
current = parser.parse_constraints(constraint)
if python_version == '*':
continue
elif constraint == '*':
python_version = current
elif current.matches(previous):
python_version = constraint
if not platforms:
platform = None
else:
platform = platforms[0]
previous = GenericConstraint.parse(platform)
for constraint in platforms[1:]:
current = GenericConstraint.parse(constraint)
if platform == '*':
continue
elif constraint == '*':
platform = constraint
elif current.matches(previous):
platform = constraint
return category, optional, python_version, platform
tests/installation/test_installer.py
...@@ -320,9 +320,6 @@ def test_run_with_optional_and_python_restricted_dependencies(installer, locker, ...@@ -320,9 +320,6 @@ def test_run_with_optional_and_python_restricted_dependencies(installer, locker,
installer.run() installer.run()
expected = fixture('with-optional-dependencies') expected = fixture('with-optional-dependencies')
import json
print(json.dumps(locker.written_data, indent=2, sort_keys=True))
print(json.dumps(expected, indent=2, sort_keys=True))
assert locker.written_data == expected assert locker.written_data == expected
installer = installer.installer installer = installer.installer
......
tests/puzzle/test_solver.py
...@@ -508,13 +508,16 @@ def test_solver_sub_dependencies_with_requirements(solver, repo): ...@@ -508,13 +508,16 @@ def test_solver_sub_dependencies_with_requirements(solver, repo):
package_a = get_package('A', '1.0') package_a = get_package('A', '1.0')
package_b = get_package('B', '1.0') package_b = get_package('B', '1.0')
package_c = get_package('C', '1.0') package_c = get_package('C', '1.0')
package_d = get_package('D', '1.0')
package_a.add_dependency('C', {'version': '^1.0', 'python': '<4.0'}) package_c.add_dependency('D', {'version': '^1.0', 'python': '<4.0'})
package_b.add_dependency('C', '^1.0') package_a.add_dependency('C')
package_b.add_dependency('D', '^1.0')
repo.add_package(package_a) repo.add_package(package_a)
repo.add_package(package_b) repo.add_package(package_b)
repo.add_package(package_c) repo.add_package(package_c)
repo.add_package(package_d)
dependency_a = get_dependency('A') dependency_a = get_dependency('A')
dependency_b = get_dependency('B') dependency_b = get_dependency('B')
...@@ -527,9 +530,59 @@ def test_solver_sub_dependencies_with_requirements(solver, repo): ...@@ -527,9 +530,59 @@ def test_solver_sub_dependencies_with_requirements(solver, repo):
check_solver_result(ops, [ check_solver_result(ops, [
{'job': 'install', 'package': package_c}, {'job': 'install', 'package': package_c},
{'job': 'install', 'package': package_d},
{'job': 'install', 'package': package_a},
{'job': 'install', 'package': package_b},
])
op = ops[1]
assert op.package.requirements == {}
def test_solver_sub_dependencies_with_requirements_complex(solver, repo):
package_a = get_package('A', '1.0')
package_b = get_package('B', '1.0')
package_c = get_package('C', '1.0')
package_d = get_package('D', '1.0')
package_e = get_package('E', '1.0')
package_f = get_package('F', '1.0')
package_a.add_dependency('B', '^1.0')
package_a.add_dependency('D', {'version': '^1.0', 'python': '<4.0'})
package_b.add_dependency('E', {'version': '^1.0', 'platform': 'win32'})
package_b.add_dependency('F')
package_c.add_dependency('F', '^1.0')
package_d.add_dependency('F')
repo.add_package(package_a)
repo.add_package(package_b)
repo.add_package(package_c)
repo.add_package(package_d)
repo.add_package(package_e)
repo.add_package(package_f)
dependency_a = get_dependency('A')
dependency_b = get_dependency('B')
dependency_c = get_dependency('C')
request = [
dependency_a,
dependency_b,
dependency_c,
]
ops = solver.solve(request)
check_solver_result(ops, [
{'job': 'install', 'package': package_d},
{'job': 'install', 'package': package_e},
{'job': 'install', 'package': package_f},
{'job': 'install', 'package': package_a}, {'job': 'install', 'package': package_a},
{'job': 'install', 'package': package_b}, {'job': 'install', 'package': package_b},
{'job': 'install', 'package': package_c},
]) ])
op = ops[0] op = ops[1]
assert op.package.requirements == {'platform': 'win32'}
op = ops[2]
assert op.package.requirements == {} assert op.package.requirements == {}
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