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
a05a1a86
Unverified
Commit
a05a1a86
authored
Sep 18, 2018
by
Sébastien Eustace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dependency resolution for Python-restricted dependencies
parent
8c31f923
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
poetry/puzzle/provider.py
+5
-5
pyproject.lock
+0
-0
pyproject.toml
+2
-2
No files found.
poetry/puzzle/provider.py
View file @
a05a1a86
...
@@ -331,7 +331,7 @@ class Provider:
...
@@ -331,7 +331,7 @@ class Provider:
# In this particular case, we notify the resolver that it needs
# In this particular case, we notify the resolver that it needs
# to branch the dependency tree. What this means is if we have
# to branch the dependency tree. What this means is if we have
# root Python ~2.7 || ^3.6 and dependency Python >=3.6
# root Python ~2.7 || ^3.6 and dependency Python >=3.6
# we have to resolve for ^3.6 (>=3.6, <4.0)
# we have to resolve for ^3.6 (>=3.6, <4.0)
and for ~2.7 || <3.6
if
(
if
(
not
package
.
dependency
.
python_constraint
.
is_any
()
not
package
.
dependency
.
python_constraint
.
is_any
()
and
not
package
.
python_constraint
.
intersect
(
and
not
package
.
python_constraint
.
intersect
(
...
@@ -343,12 +343,12 @@ class Provider:
...
@@ -343,12 +343,12 @@ class Provider:
package
,
package
.
dependency
.
python_constraint
package
,
package
.
dependency
.
python_constraint
)
)
)
)
raise
CompatibilityError
(
intersection
=
self
.
_package
.
python_constraint
.
intersect
(
str
(
package
.
python_constraint
.
intersect
(
package
.
dependency
.
python_constraint
package
.
dependency
.
python_constraint
)
)
)
raise
CompatibilityError
(
str
(
intersection
),
str
(
self
.
_package
.
python_constraint
.
difference
(
intersection
)),
)
)
return
[
return
[
...
...
pyproject.lock
View file @
a05a1a86
This diff is collapsed.
Click to expand it.
pyproject.toml
View file @
a05a1a86
...
@@ -22,7 +22,7 @@ classifiers = [
...
@@ -22,7 +22,7 @@ classifiers = [
# Requirements
# Requirements
[tool.poetry.dependencies]
[tool.poetry.dependencies]
python
=
"~2.7
.9
|| ^3.4"
python
=
"~2.7 || ^3.4"
cleo
=
"^0.6.7"
cleo
=
"^0.6.7"
requests
=
"^2.18"
requests
=
"^2.18"
cachy
=
"^0.2"
cachy
=
"^0.2"
...
@@ -47,7 +47,7 @@ virtualenv = { version = "^16.0", python = "~2.7" }
...
@@ -47,7 +47,7 @@ virtualenv = { version = "^16.0", python = "~2.7" }
[tool.poetry.dev-dependencies]
[tool.poetry.dev-dependencies]
pytest
=
"^3.4"
pytest
=
"^3.4"
pytest-cov
=
"^2.5"
pytest-cov
=
"^2.5"
mkdocs
=
"^1.0"
mkdocs
=
{
version
=
"^1.0"
,
python
=
"~2.7.9 || ^3.4"
}
pymdown-extensions
=
"^4.9"
pymdown-extensions
=
"^4.9"
pygments
=
"^2.2"
pygments
=
"^2.2"
pytest-mock
=
"^1.9"
pytest-mock
=
"^1.9"
...
...
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