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
736c6d35
Unverified
Commit
736c6d35
authored
Nov 12, 2019
by
Sébastien Eustace
Committed by
GitHub
Nov 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a recursion error for duplicate constraints with only extras (#1574)
parent
ead7e21e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
1 deletions
+26
-1
poetry/puzzle/provider.py
+1
-1
tests/puzzle/test_solver.py
+25
-0
No files found.
poetry/puzzle/provider.py
View file @
736c6d35
...
...
@@ -604,7 +604,7 @@ class Provider:
new_markers
=
[]
for
dep
in
_deps
:
marker
=
dep
.
marker
.
without_extras
()
if
marker
.
is_
empt
y
():
if
marker
.
is_
an
y
():
# No marker or only extras
continue
...
...
tests/puzzle/test_solver.py
View file @
736c6d35
...
...
@@ -1831,3 +1831,28 @@ def test_solver_does_not_raise_conflict_for_conditional_dev_dependencies(
{
"job"
:
"install"
,
"package"
:
package_a200
},
],
)
def
test_solver_does_not_loop_indefinitely_on_duplicate_constraints_with_extras
(
solver
,
repo
,
package
):
package
.
python_versions
=
"~2.7 || ^3.5"
package
.
add_dependency
(
"requests"
,
{
"version"
:
"^2.22.0"
,
"extras"
:
[
"security"
]})
requests
=
get_package
(
"requests"
,
"2.22.0"
)
requests
.
add_dependency
(
"idna"
,
">=2.5,<2.9"
)
requests
.
add_dependency
(
"idna"
,
{
"version"
:
">=2.0.0"
,
"markers"
:
"extra == 'security'"
}
)
requests
.
extras
[
"security"
]
=
[
get_dependency
(
"idna"
,
">=2.0.0"
)]
idna
=
get_package
(
"idna"
,
"2.8"
)
repo
.
add_package
(
requests
)
repo
.
add_package
(
idna
)
ops
=
solver
.
solve
()
check_solver_result
(
ops
,
[{
"job"
:
"install"
,
"package"
:
idna
},
{
"job"
:
"install"
,
"package"
:
requests
}],
)
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