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
8b8b97a6
Unverified
Commit
8b8b97a6
authored
Aug 28, 2020
by
Arun Babu Neelicattu
Committed by
GitHub
Aug 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle circular dependencies when getting extras (#2787)
Resolves: #2376
parent
1c8abd4b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletions
+21
-1
poetry/utils/extras.py
+9
-1
tests/utils/test_extras.py
+12
-0
No files found.
poetry/utils/extras.py
View file @
8b8b97a6
...
...
@@ -33,6 +33,9 @@ def get_extra_package_names(
for
extra_package_name
in
extras
.
get
(
extra_name
,
())
]
# keep record of packages seen during recursion in order to avoid recursion error
seen_package_names
=
set
()
def
_extra_packages
(
package_names
):
"""Recursively find dependencies for packages names"""
# for each extra pacakge name
...
...
@@ -41,11 +44,16 @@ def get_extra_package_names(
# dependency (like setuptools), which should be ignored
package
=
packages_by_name
.
get
(
canonicalize_name
(
package_name
))
if
package
:
if
package
.
name
not
in
seen_package_names
:
seen_package_names
.
add
(
package
.
name
)
yield
package
.
name
# Recurse for dependencies
for
dependency_package_name
in
_extra_packages
(
dependency
.
name
for
dependency
in
package
.
requires
dependency
.
name
for
dependency
in
package
.
requires
if
dependency
.
name
not
in
seen_package_names
):
seen_package_names
.
add
(
dependency_package_name
)
yield
dependency_package_name
return
_extra_packages
(
extra_package_names
)
tests/utils/test_extras.py
View file @
8b8b97a6
...
...
@@ -9,6 +9,12 @@ _PACKAGE_SPAM = Package("spam", "0.2.0")
_PACKAGE_BAR
=
Package
(
"bar"
,
"0.3.0"
)
_PACKAGE_BAR
.
add_dependency
(
"foo"
)
# recursive dependency
_PACKAGE_BAZ
=
Package
(
"baz"
,
"0.4.0"
)
_PACKAGE_BAZ
.
add_dependency
(
"quix"
)
_PACKAGE_QUIX
=
Package
(
"quix"
,
"0.5.0"
)
_PACKAGE_QUIX
.
add_dependency
(
"baz"
)
@pytest.mark.parametrize
(
"packages,extras,extra_names,expected_extra_package_names"
,
...
...
@@ -40,6 +46,12 @@ _PACKAGE_BAR.add_dependency("foo")
[
"group0"
,
"group1"
],
[
"bar"
,
"foo"
,
"spam"
],
),
(
[
_PACKAGE_BAZ
,
_PACKAGE_QUIX
],
{
"group0"
:
[
"baz"
],
"group1"
:
[
"quix"
]},
[
"group0"
,
"group1"
],
[
"baz"
,
"quix"
],
),
],
)
def
test_get_extra_package_names
(
...
...
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