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
2cab0744
Unverified
Commit
2cab0744
authored
Jan 20, 2023
by
Yeger
Committed by
GitHub
Jan 20, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Order root extra dependencies (#7375)
parent
7279a073
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
1 deletions
+36
-1
src/poetry/packages/locker.py
+1
-1
tests/packages/test_locker.py
+35
-0
No files found.
src/poetry/packages/locker.py
View file @
2cab0744
...
...
@@ -244,7 +244,7 @@ class Locker:
if
root
.
extras
:
lock
[
"extras"
]
=
{
extra
:
[
dep
.
pretty_name
for
dep
in
deps
]
extra
:
sorted
(
dep
.
pretty_name
for
dep
in
deps
)
for
extra
,
deps
in
sorted
(
root
.
extras
.
items
())
}
...
...
tests/packages/test_locker.py
View file @
2cab0744
...
...
@@ -737,6 +737,41 @@ content-hash = "c3d07fca33fba542ef2b2a4d75bf5b48d892d21a830e2ad9c952ba5123a52f77
_
=
locker
.
lock_data
def
test_root_extras_dependencies_are_ordered
(
locker
:
Locker
,
root
:
ProjectPackage
):
root_dir
=
Path
(
__file__
)
.
parent
.
parent
.
joinpath
(
"fixtures"
)
Factory
.
create_dependency
(
"B"
,
"1.0.0"
,
root_dir
=
root_dir
)
Factory
.
create_dependency
(
"C"
,
"1.0.0"
,
root_dir
=
root_dir
)
package_first
=
Factory
.
create_dependency
(
"first"
,
"1.0.0"
,
root_dir
=
root_dir
)
package_second
=
Factory
.
create_dependency
(
"second"
,
"1.0.0"
,
root_dir
=
root_dir
)
package_third
=
Factory
.
create_dependency
(
"third"
,
"1.0.0"
,
root_dir
=
root_dir
)
root
.
extras
=
{
"C"
:
[
package_third
,
package_second
,
package_first
],
"B"
:
[
package_first
,
package_second
,
package_third
],
}
locker
.
set_lock_data
(
root
,
[])
expected
=
f
"""
\
# {GENERATED_COMMENT}
package = []
[extras]
B = ["first", "second", "third"]
C = ["first", "second", "third"]
[metadata]
lock-version = "2.0"
python-versions = "*"
content-hash = "115cf985d932e9bf5f540555bbdd75decbb62cac81e399375fc19f6277f8c1d8"
"""
# noqa: E800
with
locker
.
lock
.
open
(
encoding
=
"utf-8"
)
as
f
:
content
=
f
.
read
()
print
(
content
)
assert
content
==
expected
def
test_extras_dependencies_are_ordered
(
locker
:
Locker
,
root
:
ProjectPackage
):
package_a
=
get_package
(
"A"
,
"1.0.0"
)
package_a
.
add_dependency
(
...
...
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