Skip to content

Commit

Permalink
Rename local variable for clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
radoering committed Feb 28, 2022
1 parent 253986c commit 2234ceb
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/poetry/mixology/version_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,21 +366,21 @@ def _get_min(dependency: Dependency) -> tuple[bool, int]:
)
return dependency.complete_name

version = None
package = None
if dependency.name not in self._use_latest:
# prefer locked version of compatible (not exact same) dependency;
# required in order to not unnecessarily update dependencies with
# extras, e.g. "coverage" vs. "coverage[toml]"
locked = self._locked.get(dependency.name, None)
if locked is not None:
version = next(
package = next(
(p for p in packages if p.version == locked.version), None
)
if version is None:
if package is None:
with suppress(IndexError):
version = packages[0]
package = packages[0]

if version is None:
if package is None:
# If there are no versions that satisfy the constraint,
# add an incompatibility that indicates that.
self._add_incompatibility(
Expand All @@ -389,12 +389,12 @@ def _get_min(dependency: Dependency) -> tuple[bool, int]:

return dependency.complete_name
else:
version = locked
package = locked

version = self._provider.complete_package(version)
package = self._provider.complete_package(package)

conflict = False
for incompatibility in self._provider.incompatibilities_for(version):
for incompatibility in self._provider.incompatibilities_for(package):
self._add_incompatibility(incompatibility)

# If an incompatibility is already satisfied, then selecting version
Expand All @@ -409,9 +409,9 @@ def _get_min(dependency: Dependency) -> tuple[bool, int]:
)

if not conflict:
self._solution.decide(version)
self._solution.decide(package)
self._log(
f"selecting {version.complete_name} ({version.full_pretty_version})"
f"selecting {package.complete_name} ({package.full_pretty_version})"
)

return dependency.complete_name
Expand Down

0 comments on commit 2234ceb

Please sign in to comment.