Skip to content
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

Add a --remove-untracked option to the install command. #2172

Merged
merged 13 commits into from
May 1, 2020
Merged

Add a --remove-untracked option to the install command. #2172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
88bfa55
Add a --keep-untracked option to the install command.
PetterS Mar 11, 2020
d717e0b
Call the option --remove-untracked instead.
PetterS Mar 18, 2020
e7f5651
Add test and fix Installer.
PetterS Mar 18, 2020
78e8f16
Add documentation.
PetterS Mar 18, 2020
201044c
Make sure to never remove essential packages like pip, setuptools and…
PetterS Mar 26, 2020
71c1886
Merge remote-tracking branch 'upstream/develop' into install-keep-unt…
PetterS Apr 29, 2020
c4a2c62
Merge with origin.
PetterS Apr 29, 2020
0dacf9f
Merge with develop.
PetterS May 1, 2020
601881b
Move logic to the Solver instead.
PetterS May 1, 2020
4029596
Add a few unit tests for Solver.
PetterS May 1, 2020
44cd316
Add type hints to solver.py.
PetterS May 1, 2020
d9d2027
Run black after commit fron Github.
PetterS May 1, 2020
12c7221
Import the identifiers used in type annotations.
PetterS May 1, 2020
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
Prev Previous commit
Next Next commit
Call the option --remove-untracked instead.
  • Loading branch information
@PetterS
PetterS committed Mar 18, 2020
commit d717e0bcc28796c58fef91c1a730bc707b663f2c
6 changes: 2 additions & 4 deletions poetry/console/commands/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ class InstallCommand(EnvCommand):
"(implicitly enables --verbose).",
),
option(
"keep-untracked",
None,
"Does not remove packages not present in the lock file.",
"remove-untracked", None, "Removes packages not present in the lock file.",
),
option(
"extras",
Expand Down Expand Up @@ -63,7 +61,7 @@ def handle(self):
installer.extras(extras)
installer.dev_mode(not self.option("no-dev"))
installer.dry_run(self.option("dry-run"))
installer.keep_untracked(self.option("keep-untracked"))
installer.remove_untracked(self.option("remove-untracked"))
installer.verbose(self.option("verbose"))

return_code = installer.run()
Expand Down
12 changes: 6 additions & 6 deletions poetry/installation/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(
self._pool = pool

self._dry_run = False
self._keep_untracked = False
self._remove_untracked = False
self._update = False
self._verbose = False
self._write_lock = True
Expand Down Expand Up @@ -84,13 +84,13 @@ def dry_run(self, dry_run=True): # type: (bool) -> Installer
def is_dry_run(self): # type: () -> bool
return self._dry_run

def keep_untracked(self, keep_untracked=True): # type: (bool) -> Installer
self._keep_untracked = keep_untracked
def remove_untracked(self, remove_untracked=True): # type: (bool) -> Installer
self._remove_untracked = remove_untracked

return self

def is_keep_untracked(self): # type: () -> bool
return self._keep_untracked
def is_remove_untracked(self): # type: () -> bool
return self._remove_untracked

def verbose(self, verbose=True): # type: (bool) -> Installer
self._verbose = verbose
Expand Down Expand Up @@ -433,7 +433,7 @@ def _get_operations_from_lock(

ops.append(op)

if not self._keep_untracked:
if self._remove_untracked:
for installed in installed_repo.packages:
is_in_lock_file = False
for locked in locked_repository.packages:
Expand Down