Skip to content

Commit

Permalink
locker: remove with_dev_reqs parameter
Browse files Browse the repository at this point in the history
This is no longer required and is superseded by the groups feature.
  • Loading branch information
abn authored and radoering committed Apr 16, 2022
1 parent 6b53a1e commit 0c6808b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/poetry/console/commands/show.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def handle(self) -> int | None:
)
return 1

locked_repo = self.poetry.locker.locked_repository(True)
locked_repo = self.poetry.locker.locked_repository()
root = self.project_with_activated_groups_only()

# Show tree view if requested
Expand Down
6 changes: 3 additions & 3 deletions src/poetry/installation/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def _do_refresh(self) -> int:
if extra not in self._package.extras:
raise ValueError(f"Extra [{extra}] is not specified.")

locked_repository = self._locker.locked_repository(True)
locked_repository = self._locker.locked_repository()
solver = Solver(
self._package,
self._pool,
Expand All @@ -214,7 +214,7 @@ def _do_install(self, local_repo: Repository) -> int:
locked_repository = Repository()
if self._update:
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),
# we whitelist every package in the lock file.
Expand All @@ -240,7 +240,7 @@ def _do_install(self, local_repo: Repository) -> int:
else:
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():
self._io.write_error_line(
Expand Down
13 changes: 3 additions & 10 deletions src/poetry/packages/locker.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def is_fresh(self) -> bool:

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.
"""
Expand All @@ -98,13 +98,7 @@ def locked_repository(self, with_dev_reqs: bool = False) -> Repository:

lock_data = self.lock_data
packages = Repository()

if with_dev_reqs:
locked_packages = lock_data["package"]
else:
locked_packages = [
p for p in lock_data["package"] if p["category"] == "main"
]
locked_packages = lock_data["package"]

if not locked_packages:
return packages
Expand Down Expand Up @@ -317,7 +311,6 @@ def get_project_dependency_packages(
self,
project_requires: list[Dependency],
project_python_marker: BaseMarker | None = None,
dev: bool = False,
extras: bool | Sequence[str] | None = None,
) -> Iterator[DependencyPackage]:
# Apply the project python marker to all requirements.
Expand All @@ -329,7 +322,7 @@ def get_project_dependency_packages(
marked_requires.append(require)
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
extra_package_names: set[str] | None = None
Expand Down
6 changes: 2 additions & 4 deletions tests/console/commands/test_lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,7 @@ def test_lock_no_update(
)
poetry_with_old_lockfile.set_locker(locker)

locked_repository = poetry_with_old_lockfile.locker.locked_repository(
with_dev_reqs=True
)
locked_repository = poetry_with_old_lockfile.locker.locked_repository()
assert (
poetry_with_old_lockfile.locker.lock_data["metadata"].get("lock-version")
== "1.0"
Expand All @@ -144,7 +142,7 @@ def test_lock_no_update(
lock=poetry_with_old_lockfile.pyproject.file.path.parent / "poetry.lock",
local_config={},
)
packages = locker.locked_repository(True).packages
packages = locker.locked_repository().packages

assert len(packages) == len(locked_repository.packages)

Expand Down

0 comments on commit 0c6808b

Please sign in to comment.