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
0c6808ba
Commit
0c6808ba
authored
Apr 11, 2022
by
Arun Babu Neelicattu
Committed by
Randy Döring
Apr 16, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
locker: remove with_dev_reqs parameter
This is no longer required and is superseded by the groups feature.
parent
6b53a1e2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
17 deletions
+8
-17
src/poetry/console/commands/show.py
+1
-1
src/poetry/installation/installer.py
+3
-3
src/poetry/packages/locker.py
+2
-9
tests/console/commands/test_lock.py
+2
-4
No files found.
src/poetry/console/commands/show.py
View file @
0c6808ba
...
@@ -75,7 +75,7 @@ lists all packages available."""
...
@@ -75,7 +75,7 @@ lists all packages available."""
)
)
return
1
return
1
locked_repo
=
self
.
poetry
.
locker
.
locked_repository
(
True
)
locked_repo
=
self
.
poetry
.
locker
.
locked_repository
()
root
=
self
.
project_with_activated_groups_only
()
root
=
self
.
project_with_activated_groups_only
()
# Show tree view if requested
# Show tree view if requested
...
...
src/poetry/installation/installer.py
View file @
0c6808ba
...
@@ -190,7 +190,7 @@ class Installer:
...
@@ -190,7 +190,7 @@ class Installer:
if
extra
not
in
self
.
_package
.
extras
:
if
extra
not
in
self
.
_package
.
extras
:
raise
ValueError
(
f
"Extra [{extra}] is not specified."
)
raise
ValueError
(
f
"Extra [{extra}] is not specified."
)
locked_repository
=
self
.
_locker
.
locked_repository
(
True
)
locked_repository
=
self
.
_locker
.
locked_repository
()
solver
=
Solver
(
solver
=
Solver
(
self
.
_package
,
self
.
_package
,
self
.
_pool
,
self
.
_pool
,
...
@@ -214,7 +214,7 @@ class Installer:
...
@@ -214,7 +214,7 @@ class Installer:
locked_repository
=
Repository
()
locked_repository
=
Repository
()
if
self
.
_update
:
if
self
.
_update
:
if
self
.
_locker
.
is_locked
()
and
not
self
.
_lock
:
if
self
.
_locker
.
is_locked
()
and
not
self
.
_lock
:
locked_repository
=
self
.
_locker
.
locked_repository
(
True
)
locked_repository
=
self
.
_locker
.
locked_repository
()
# If no packages have been whitelisted (The ones we want to update),
# If no packages have been whitelisted (The ones we want to update),
# we whitelist every package in the lock file.
# we whitelist every package in the lock file.
...
@@ -240,7 +240,7 @@ class Installer:
...
@@ -240,7 +240,7 @@ class Installer:
else
:
else
:
self
.
_io
.
write_line
(
"<info>Installing dependencies from lock file</>"
)
self
.
_io
.
write_line
(
"<info>Installing dependencies from lock file</>"
)
locked_repository
=
self
.
_locker
.
locked_repository
(
True
)
locked_repository
=
self
.
_locker
.
locked_repository
()
if
not
self
.
_locker
.
is_fresh
():
if
not
self
.
_locker
.
is_fresh
():
self
.
_io
.
write_error_line
(
self
.
_io
.
write_error_line
(
...
...
src/poetry/packages/locker.py
View file @
0c6808ba
...
@@ -86,7 +86,7 @@ class Locker:
...
@@ -86,7 +86,7 @@ class Locker:
return
False
return
False
def
locked_repository
(
self
,
with_dev_reqs
:
bool
=
False
)
->
Repository
:
def
locked_repository
(
self
)
->
Repository
:
"""
"""
Searches and returns a repository of locked packages.
Searches and returns a repository of locked packages.
"""
"""
...
@@ -98,13 +98,7 @@ class Locker:
...
@@ -98,13 +98,7 @@ class Locker:
lock_data
=
self
.
lock_data
lock_data
=
self
.
lock_data
packages
=
Repository
()
packages
=
Repository
()
if
with_dev_reqs
:
locked_packages
=
lock_data
[
"package"
]
locked_packages
=
lock_data
[
"package"
]
else
:
locked_packages
=
[
p
for
p
in
lock_data
[
"package"
]
if
p
[
"category"
]
==
"main"
]
if
not
locked_packages
:
if
not
locked_packages
:
return
packages
return
packages
...
@@ -317,7 +311,6 @@ class Locker:
...
@@ -317,7 +311,6 @@ class Locker:
self
,
self
,
project_requires
:
list
[
Dependency
],
project_requires
:
list
[
Dependency
],
project_python_marker
:
BaseMarker
|
None
=
None
,
project_python_marker
:
BaseMarker
|
None
=
None
,
dev
:
bool
=
False
,
extras
:
bool
|
Sequence
[
str
]
|
None
=
None
,
extras
:
bool
|
Sequence
[
str
]
|
None
=
None
,
)
->
Iterator
[
DependencyPackage
]:
)
->
Iterator
[
DependencyPackage
]:
# Apply the project python marker to all requirements.
# Apply the project python marker to all requirements.
...
@@ -329,7 +322,7 @@ class Locker:
...
@@ -329,7 +322,7 @@ class Locker:
marked_requires
.
append
(
require
)
marked_requires
.
append
(
require
)
project_requires
=
marked_requires
project_requires
=
marked_requires
repository
=
self
.
locked_repository
(
with_dev_reqs
=
dev
)
repository
=
self
.
locked_repository
()
# Build a set of all packages required by our selected extras
# Build a set of all packages required by our selected extras
extra_package_names
:
set
[
str
]
|
None
=
None
extra_package_names
:
set
[
str
]
|
None
=
None
...
...
tests/console/commands/test_lock.py
View file @
0c6808ba
...
@@ -129,9 +129,7 @@ def test_lock_no_update(
...
@@ -129,9 +129,7 @@ def test_lock_no_update(
)
)
poetry_with_old_lockfile
.
set_locker
(
locker
)
poetry_with_old_lockfile
.
set_locker
(
locker
)
locked_repository
=
poetry_with_old_lockfile
.
locker
.
locked_repository
(
locked_repository
=
poetry_with_old_lockfile
.
locker
.
locked_repository
()
with_dev_reqs
=
True
)
assert
(
assert
(
poetry_with_old_lockfile
.
locker
.
lock_data
[
"metadata"
]
.
get
(
"lock-version"
)
poetry_with_old_lockfile
.
locker
.
lock_data
[
"metadata"
]
.
get
(
"lock-version"
)
==
"1.0"
==
"1.0"
...
@@ -144,7 +142,7 @@ def test_lock_no_update(
...
@@ -144,7 +142,7 @@ def test_lock_no_update(
lock
=
poetry_with_old_lockfile
.
pyproject
.
file
.
path
.
parent
/
"poetry.lock"
,
lock
=
poetry_with_old_lockfile
.
pyproject
.
file
.
path
.
parent
/
"poetry.lock"
,
local_config
=
{},
local_config
=
{},
)
)
packages
=
locker
.
locked_repository
(
True
)
.
packages
packages
=
locker
.
locked_repository
()
.
packages
assert
len
(
packages
)
==
len
(
locked_repository
.
packages
)
assert
len
(
packages
)
==
len
(
locked_repository
.
packages
)
...
...
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