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
979d9458
Commit
979d9458
authored
May 23, 2022
by
Mathieu Kniewallner
Committed by
Arun Babu Neelicattu
May 27, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(commands/remove): canonicalize package name when looking for existing packages
parent
2ca2080c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
1 deletions
+58
-1
src/poetry/console/commands/remove.py
+3
-1
tests/console/commands/test_remove.py
+55
-0
No files found.
src/poetry/console/commands/remove.py
View file @
979d9458
...
...
@@ -6,6 +6,8 @@ from cleo.helpers import argument
from
cleo.helpers
import
option
from
tomlkit.toml_document
import
TOMLDocument
from
poetry.utils.helpers
import
canonicalize_name
try
:
from
poetry.core.packages.dependency_group
import
MAIN_GROUP
...
...
@@ -129,7 +131,7 @@ list of installed packages
for
package
in
packages
:
for
existing_package
in
section_keys
:
if
existing_package
.
lower
()
==
package
.
lower
(
):
if
canonicalize_name
(
existing_package
)
==
canonicalize_name
(
package
):
del
section
[
existing_package
]
removed
.
append
(
package
)
group
.
remove_dependency
(
package
)
...
...
tests/console/commands/test_remove.py
View file @
979d9458
...
...
@@ -183,6 +183,61 @@ baz = "^1.0.0"
assert
"[tool.poetry.group]"
not
in
content
.
as_string
()
def
test_remove_canonicalized_named_removes_dependency_correctly
(
tester
:
CommandTester
,
app
:
PoetryTestApplication
,
repo
:
TestRepository
,
command_tester_factory
:
CommandTesterFactory
,
installed
:
Repository
,
):
"""
Removing a dependency using a canonicalized named removes the dependency.
"""
installed
.
add_package
(
Package
(
"foo-bar"
,
"2.0.0"
))
repo
.
add_package
(
Package
(
"foo-bar"
,
"2.0.0"
))
repo
.
add_package
(
Package
(
"baz"
,
"1.0.0"
))
content
=
app
.
poetry
.
file
.
read
()
groups_content
=
tomlkit
.
parse
(
"""
\
[tool.poetry.group.bar.dependencies]
foo-bar = "^2.0.0"
baz = "^1.0.0"
"""
)
content
[
"tool"
][
"poetry"
][
"dependencies"
][
"foo-bar"
]
=
"^2.0.0"
content
[
"tool"
][
"poetry"
]
.
value
.
_insert_after
(
"dependencies"
,
"group"
,
groups_content
[
"tool"
][
"poetry"
][
"group"
]
)
app
.
poetry
.
file
.
write
(
content
)
app
.
poetry
.
package
.
add_dependency
(
Factory
.
create_dependency
(
"foo-bar"
,
"^2.0.0"
))
app
.
poetry
.
package
.
add_dependency
(
Factory
.
create_dependency
(
"foo-bar"
,
"^2.0.0"
,
groups
=
[
"bar"
])
)
app
.
poetry
.
package
.
add_dependency
(
Factory
.
create_dependency
(
"baz"
,
"^1.0.0"
,
groups
=
[
"bar"
])
)
tester
.
execute
(
"Foo_Bar"
)
content
=
app
.
poetry
.
file
.
read
()[
"tool"
][
"poetry"
]
assert
"foo-bar"
not
in
content
[
"dependencies"
]
assert
"foo-bar"
not
in
content
[
"group"
][
"bar"
][
"dependencies"
]
assert
"baz"
in
content
[
"group"
][
"bar"
][
"dependencies"
]
expected
=
"""
\
[tool.poetry.group.bar.dependencies]
baz = "^1.0.0"
"""
assert
expected
in
content
.
as_string
()
def
test_remove_command_should_not_write_changes_upon_installer_errors
(
tester
:
CommandTester
,
app
:
PoetryTestApplication
,
...
...
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