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
b70d2602
Commit
b70d2602
authored
Dec 23, 2021
by
Randy Döring
Committed by
Bjorn Neergaard
Jan 23, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix misuse of pretty_constraint exposed by downstream test after fix in poetry-core
parent
33967697
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
10 deletions
+19
-10
src/poetry/packages/locker.py
+5
-5
src/poetry/utils/exporter.py
+14
-5
No files found.
src/poetry/packages/locker.py
View file @
b70d2602
...
...
@@ -237,16 +237,16 @@ class Locker:
if
locked_package
:
# create dependency from locked package to retain dependency metadata
# if this is not done, we can end-up with incorrect nested dependencies
constraint
=
requirement
.
constraint
pretty_constraint
=
requirement
.
pretty_constraint
marker
=
requirement
.
marker
requirement
=
locked_package
.
to_dependency
()
requirement
.
marker
=
requirement
.
marker
.
intersect
(
marker
)
key
=
(
requirement
.
name
,
requirement
.
pretty_constraint
)
key
=
(
requirement
.
name
,
pretty_constraint
)
if
pinned_versions
:
requirement
.
set_constraint
(
locked_package
.
to_dependency
()
.
constraint
)
if
not
pinned_versions
:
requirement
.
set_constraint
(
constraint
)
for
require
in
locked_package
.
requires
:
if
require
.
marker
.
is_empty
():
...
...
src/poetry/utils/exporter.py
View file @
b70d2602
import
itertools
import
urllib.parse
from
typing
import
TYPE_CHECKING
...
...
@@ -69,13 +70,21 @@ class Exporter:
content
=
""
dependency_lines
=
set
()
for
dependency_package
in
self
.
_poetry
.
locker
.
get_project_dependency_packages
(
project_requires
=
self
.
_poetry
.
package
.
all_requires
,
dev
=
dev
,
extras
=
extras
for
package
,
groups
in
itertools
.
groupby
(
self
.
_poetry
.
locker
.
get_project_dependency_packages
(
project_requires
=
self
.
_poetry
.
package
.
all_requires
,
dev
=
dev
,
extras
=
extras
,
),
lambda
dependency_package
:
dependency_package
.
package
,
):
line
=
""
dependency
=
dependency_package
.
dependency
package
=
dependency_package
.
package
dependency_packages
=
list
(
groups
)
dependency
=
dependency_packages
[
0
]
.
dependency
marker
=
dependency
.
marker
for
dep_package
in
dependency_packages
[
1
:]:
marker
=
marker
.
union
(
dep_package
.
dependency
.
marker
)
dependency
.
marker
=
marker
if
package
.
develop
:
line
+=
"-e "
...
...
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