Skip to content

Executor: Remove duplicate entry with dry-run argument #4660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
branchv merged 7 commits into from
Aug 24, 2022
Merged

Executor: Remove duplicate entry with dry-run argument #4660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1b3ba6
Executor: Remove duplicate entry with dry-run argument
Oct 20, 2021
1cbfd09
Fixed executor, removed extra code when not self._enabled or self._dr…
mmacchia Jun 4, 2022
f3af27e
Removed test_remove
mmacchia Jun 4, 2022
40ece6c
Revert "Removed test_remove"
mmacchia Jun 4, 2022
0fbb31d
Updated test_remove_plugins dry run test case
mmacchia Jun 4, 2022
38b405c
Removed commands plugin folder, align with master
mmacchia Jun 4, 2022
bc5b704
Merge branch 'master' into issue/3097
mmacchia Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/poetry/installation/executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,6 @@ def _do_execute_operation(self, operation: Operation) -> int:
return 0

if not self._enabled or self._dry_run:
self._io.write_line(f" <fg=blue;options=bold>•</> {operation_message}")

return 0

result: int = getattr(self, f"_execute_{method}")(operation)
Expand Down Expand Up @@ -700,7 +698,9 @@ def _download_archive(self, operation: Install | Update, link: Link) -> Path:
return archive

def _should_write_operation(self, operation: Operation) -> bool:
return not operation.skipped or self._dry_run or self._verbose
return (
not operation.skipped or self._dry_run or self._verbose or not self._enabled
)

def _save_url_reference(self, operation: Operation) -> None:
"""
Expand Down
1 change: 0 additions & 1 deletion tests/console/commands/self/test_remove_plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ def test_remove_installed_package_dry_run(tester: CommandTester):

Package operations: 0 installs, 0 updates, 1 removal, 1 skipped

• Removing poetry-plugin (1.2.3)
• Removing poetry-plugin (1.2.3)
• Installing poetry ({__version__}): Skipped for the following reason: Already \
installed
Expand Down