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
c855572b
Unverified
Commit
c855572b
authored
May 04, 2018
by
Sébastien Eustace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error where incompatible dependencies were resolved
parent
e592fba9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletions
+27
-1
poetry/puzzle/provider.py
+3
-1
tests/puzzle/test_solver.py
+24
-0
No files found.
poetry/puzzle/provider.py
View file @
c855572b
...
@@ -279,7 +279,9 @@ class Provider(SpecificationProvider, UI):
...
@@ -279,7 +279,9 @@ class Provider(SpecificationProvider, UI):
return
[
return
[
r
for
r
in
package
.
requires
r
for
r
in
package
.
requires
if
not
r
.
is_optional
()
if
not
r
.
is_optional
()
and
r
.
name
not
in
self
.
UNSAFE_PACKAGES
and
self
.
_package
.
python_constraint
.
matches
(
r
.
python_constraint
)
and
self
.
_package
.
platform_constraint
.
matches
(
package
.
platform_constraint
)
and
r
.
name
not
in
self
.
UNSAFE_PACKAGES
]
]
def
is_requirement_satisfied_by
(
self
,
def
is_requirement_satisfied_by
(
self
,
...
...
tests/puzzle/test_solver.py
View file @
c855572b
...
@@ -587,3 +587,27 @@ def test_solver_sub_dependencies_with_requirements_complex(solver, repo):
...
@@ -587,3 +587,27 @@ def test_solver_sub_dependencies_with_requirements_complex(solver, repo):
op
=
ops
[
2
]
op
=
ops
[
2
]
assert
op
.
package
.
requirements
==
{}
assert
op
.
package
.
requirements
==
{}
def
test_solver_sub_dependencies_with_not_supported_python_version
(
solver
,
repo
,
package
):
package
.
python_versions
=
'^3.5'
package_a
=
get_package
(
'A'
,
'1.0'
)
package_b
=
get_package
(
'B'
,
'1.0'
)
package_b
.
python_versions
=
'<2.0'
package_a
.
add_dependency
(
'B'
,
{
'version'
:
'^1.0'
,
'python'
:
'<2.0'
})
repo
.
add_package
(
package_a
)
repo
.
add_package
(
package_b
)
dependency_a
=
get_dependency
(
'A'
)
request
=
[
dependency_a
,
]
ops
=
solver
.
solve
(
request
)
check_solver_result
(
ops
,
[
{
'job'
:
'install'
,
'package'
:
package_a
},
])
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