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
4d76babf
Commit
4d76babf
authored
Mar 19, 2022
by
David Hotham
Committed by
Arun Babu Neelicattu
Apr 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't reuse the same incompatibility repeatedly
parent
6b55341c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
src/poetry/mixology/version_solver.py
+8
-0
No files found.
src/poetry/mixology/version_solver.py
View file @
4d76babf
...
@@ -55,6 +55,7 @@ class VersionSolver:
...
@@ -55,6 +55,7 @@ class VersionSolver:
self
.
_use_latest
=
use_latest
self
.
_use_latest
=
use_latest
self
.
_incompatibilities
:
dict
[
str
,
list
[
Incompatibility
]]
=
{}
self
.
_incompatibilities
:
dict
[
str
,
list
[
Incompatibility
]]
=
{}
self
.
_contradicted_incompatibilities
:
set
[
Incompatibility
]
=
set
()
self
.
_solution
=
PartialSolution
()
self
.
_solution
=
PartialSolution
()
@property
@property
...
@@ -103,6 +104,9 @@ class VersionSolver:
...
@@ -103,6 +104,9 @@ class VersionSolver:
# we can derive stronger assignments sooner and more eagerly find
# we can derive stronger assignments sooner and more eagerly find
# conflicts.
# conflicts.
for
incompatibility
in
reversed
(
self
.
_incompatibilities
[
package
]):
for
incompatibility
in
reversed
(
self
.
_incompatibilities
[
package
]):
if
incompatibility
in
self
.
_contradicted_incompatibilities
:
continue
result
=
self
.
_propagate_incompatibility
(
incompatibility
)
result
=
self
.
_propagate_incompatibility
(
incompatibility
)
if
result
is
_conflict
:
if
result
is
_conflict
:
...
@@ -149,6 +153,7 @@ class VersionSolver:
...
@@ -149,6 +153,7 @@ class VersionSolver:
# If term is already contradicted by _solution, then
# If term is already contradicted by _solution, then
# incompatibility is contradicted as well and there's nothing new we
# incompatibility is contradicted as well and there's nothing new we
# can deduce from it.
# can deduce from it.
self
.
_contradicted_incompatibilities
.
add
(
incompatibility
)
return
None
return
None
elif
relation
==
SetRelation
.
OVERLAPPING
:
elif
relation
==
SetRelation
.
OVERLAPPING
:
# If more than one term is inconclusive, we can't deduce anything about
# If more than one term is inconclusive, we can't deduce anything about
...
@@ -166,6 +171,8 @@ class VersionSolver:
...
@@ -166,6 +171,8 @@ class VersionSolver:
if
unsatisfied
is
None
:
if
unsatisfied
is
None
:
return
_conflict
return
_conflict
self
.
_contradicted_incompatibilities
.
add
(
incompatibility
)
adverb
=
"not "
if
unsatisfied
.
is_positive
()
else
""
adverb
=
"not "
if
unsatisfied
.
is_positive
()
else
""
self
.
_log
(
f
"derived: {adverb}{unsatisfied.dependency}"
)
self
.
_log
(
f
"derived: {adverb}{unsatisfied.dependency}"
)
...
@@ -255,6 +262,7 @@ class VersionSolver:
...
@@ -255,6 +262,7 @@ class VersionSolver:
or
most_recent_satisfier
.
cause
is
None
or
most_recent_satisfier
.
cause
is
None
):
):
self
.
_solution
.
backtrack
(
previous_satisfier_level
)
self
.
_solution
.
backtrack
(
previous_satisfier_level
)
self
.
_contradicted_incompatibilities
.
clear
()
if
new_incompatibility
:
if
new_incompatibility
:
self
.
_add_incompatibility
(
incompatibility
)
self
.
_add_incompatibility
(
incompatibility
)
...
...
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