Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
python-poetry
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
python-poetry
Commits
feef53be
Commit
feef53be
authored
Jul 03, 2020
by
Sébastien Eustace
Committed by
Arun Babu Neelicattu
Jul 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dependency overrides for packages with multiple duplicate dependencies
parent
12610bac
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
1 deletions
+41
-1
poetry/puzzle/provider.py
+1
-1
tests/puzzle/test_solver.py
+40
-0
No files found.
poetry/puzzle/provider.py
View file @
feef53be
...
...
@@ -646,7 +646,7 @@ class Provider:
overrides
=
[]
for
_dep
in
_deps
:
current_overrides
=
self
.
_overrides
.
copy
()
package_overrides
=
current_overrides
.
get
(
package
,
{})
package_overrides
=
current_overrides
.
get
(
package
,
{})
.
copy
()
package_overrides
.
update
({
_dep
.
name
:
_dep
})
current_overrides
.
update
({
package
:
package_overrides
})
overrides
.
append
(
current_overrides
)
...
...
tests/puzzle/test_solver.py
View file @
feef53be
...
...
@@ -2003,3 +2003,43 @@ def test_solver_should_not_update_same_version_packages_if_installed_has_no_sour
check_solver_result
(
ops
,
[{
"job"
:
"install"
,
"package"
:
foo
,
"skipped"
:
True
}],
)
def
test_solver_should_resolve_all_versions_for_multiple_duplicate_dependencies
(
solver
,
repo
,
package
):
package
.
python_versions
=
"~2.7 || ^3.5"
package
.
add_dependency
(
"A"
,
{
"version"
:
"^1.0"
,
"markers"
:
"python_version < '3.5'"
}
)
package
.
add_dependency
(
"A"
,
{
"version"
:
"^2.0"
,
"markers"
:
"python_version >= '3.5'"
}
)
package
.
add_dependency
(
"B"
,
{
"version"
:
"^3.0"
,
"markers"
:
"python_version < '3.5'"
}
)
package
.
add_dependency
(
"B"
,
{
"version"
:
"^4.0"
,
"markers"
:
"python_version >= '3.5'"
}
)
package_a10
=
get_package
(
"A"
,
"1.0.0"
)
package_a20
=
get_package
(
"A"
,
"2.0.0"
)
package_b30
=
get_package
(
"B"
,
"3.0.0"
)
package_b40
=
get_package
(
"B"
,
"4.0.0"
)
repo
.
add_package
(
package_a10
)
repo
.
add_package
(
package_a20
)
repo
.
add_package
(
package_b30
)
repo
.
add_package
(
package_b40
)
ops
=
solver
.
solve
()
check_solver_result
(
ops
,
[
{
"job"
:
"install"
,
"package"
:
package_a10
},
{
"job"
:
"install"
,
"package"
:
package_a20
},
{
"job"
:
"install"
,
"package"
:
package_b30
},
{
"job"
:
"install"
,
"package"
:
package_b40
},
],
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment