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
5fcdb369
Unverified
Commit
5fcdb369
authored
Oct 02, 2020
by
Arun Babu Neelicattu
Committed by
GitHub
Oct 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
exporter: handle dev extras correctly (#3038)
Resolves: #3018
parent
3611523f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
75 additions
and
7 deletions
+75
-7
poetry/packages/locker.py
+7
-3
poetry/utils/exporter.py
+6
-4
tests/utils/test_exporter.py
+62
-0
No files found.
poetry/packages/locker.py
View file @
5fcdb369
...
@@ -182,9 +182,9 @@ class Locker(object):
...
@@ -182,9 +182,9 @@ class Locker(object):
return
packages
return
packages
def
get_project_dependencies
(
def
get_project_dependencies
(
self
,
project_requires
,
pinned_versions
=
False
,
with_nested
=
False
self
,
project_requires
,
pinned_versions
=
False
,
with_nested
=
False
,
with_dev
=
False
):
# type: (List[Dependency], bool, bool) -> Any
):
# type: (List[Dependency], bool, bool
, bool
) -> Any
packages
=
self
.
locked_repository
()
.
packages
packages
=
self
.
locked_repository
(
with_dev
)
.
packages
# group packages entries by name, this is required because requirement might use
# group packages entries by name, this is required because requirement might use
# different constraints
# different constraints
...
@@ -230,6 +230,10 @@ class Locker(object):
...
@@ -230,6 +230,10 @@ class Locker(object):
# project level dependencies take precedence
# project level dependencies take precedence
continue
continue
# we make a copy to avoid any side-effects
requirement
=
deepcopy
(
requirement
)
requirement
.
_category
=
pkg
.
category
if
pinned_versions
:
if
pinned_versions
:
requirement
.
set_constraint
(
requirement
.
set_constraint
(
__get_locked_package
(
requirement
)
.
to_dependency
()
.
constraint
__get_locked_package
(
requirement
)
.
to_dependency
()
.
constraint
...
...
poetry/utils/exporter.py
View file @
5fcdb369
...
@@ -68,12 +68,14 @@ class Exporter(object):
...
@@ -68,12 +68,14 @@ class Exporter(object):
dependency_lines
=
set
()
dependency_lines
=
set
()
for
dependency
in
self
.
_poetry
.
locker
.
get_project_dependencies
(
for
dependency
in
self
.
_poetry
.
locker
.
get_project_dependencies
(
project_requires
=
self
.
_poetry
.
package
.
requires
project_requires
=
self
.
_poetry
.
package
.
all_requires
,
if
not
dev
else
self
.
_poetry
.
package
.
all_requires
,
with_nested
=
True
,
with_nested
=
True
,
with_dev
=
dev
,
):
):
package
=
repository
.
find_packages
(
dependency
=
dependency
)[
0
]
try
:
package
=
repository
.
find_packages
(
dependency
=
dependency
)[
0
]
except
IndexError
:
continue
# If a package is optional and we haven't opted in to it, continue
# If a package is optional and we haven't opted in to it, continue
if
package
.
optional
and
package
.
name
not
in
extra_package_names
:
if
package
.
optional
and
package
.
name
not
in
extra_package_names
:
...
...
tests/utils/test_exporter.py
View file @
5fcdb369
...
@@ -779,6 +779,68 @@ foo==1.2.3 \\
...
@@ -779,6 +779,68 @@ foo==1.2.3 \\
assert
expected
==
content
assert
expected
==
content
@pytest.mark.parametrize
(
(
"dev"
,
"expected"
),
[
(
True
,
[
"bar==1.2.2"
,
"baz==1.2.3"
,
"foo==1.2.1"
]),
(
False
,
[
"bar==1.2.2"
,
"foo==1.2.1"
]),
],
)
def
test_exporter_exports_requirements_txt_with_dev_extras
(
tmp_dir
,
poetry
,
dev
,
expected
):
poetry
.
locker
.
mock_lock_data
(
{
"package"
:
[
{
"name"
:
"foo"
,
"version"
:
"1.2.1"
,
"category"
:
"main"
,
"optional"
:
False
,
"python-versions"
:
"*"
,
},
{
"name"
:
"bar"
,
"version"
:
"1.2.2"
,
"category"
:
"main"
,
"optional"
:
False
,
"python-versions"
:
"*"
,
"dependencies"
:
{
"baz"
:
{
"version"
:
">=0.1.0"
,
"optional"
:
True
,
"markers"
:
"extra == 'baz'"
,
}
},
"extras"
:
{
"baz"
:
[
"baz (>=0.1.0)"
]},
},
{
"name"
:
"baz"
,
"version"
:
"1.2.3"
,
"category"
:
"dev"
,
"optional"
:
False
,
"python-versions"
:
"*"
,
},
],
"metadata"
:
{
"python-versions"
:
"*"
,
"content-hash"
:
"123456789"
,
"hashes"
:
{
"foo"
:
[],
"bar"
:
[],
"baz"
:
[]},
},
}
)
set_package_requires
(
poetry
)
exporter
=
Exporter
(
poetry
)
exporter
.
export
(
"requirements.txt"
,
Path
(
tmp_dir
),
"requirements.txt"
,
dev
=
dev
)
with
(
Path
(
tmp_dir
)
/
"requirements.txt"
)
.
open
(
encoding
=
"utf-8"
)
as
f
:
content
=
f
.
read
()
assert
content
==
"{}
\n
"
.
format
(
"
\n
"
.
join
(
expected
))
def
test_exporter_exports_requirements_txt_with_legacy_packages_and_duplicate_sources
(
def
test_exporter_exports_requirements_txt_with_legacy_packages_and_duplicate_sources
(
tmp_dir
,
poetry
tmp_dir
,
poetry
):
):
...
...
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