Skip to content

provider: do not iterate over sets for more deterministic results #10276

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
radoering merged 1 commit into from
Mar 25, 2025
Merged

provider: do not iterate over sets for more deterministic results #10276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/poetry/packages/dependency_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@


if TYPE_CHECKING:
from collections.abc import Iterable

from poetry.core.packages.dependency import Dependency
from poetry.core.packages.package import Package

Expand All @@ -24,7 +26,7 @@ def package(self) -> Package:
def clone(self) -> DependencyPackage:
return self.__class__(self._dependency, self._package.clone())

def with_features(self, features: list[str]) -> DependencyPackage:
def with_features(self, features: Iterable[str]) -> DependencyPackage:
return self.__class__(self._dependency, self._package.with_features(features))

def without_features(self) -> DependencyPackage:
Expand Down
10 changes: 4 additions & 6 deletions src/poetry/puzzle/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ def _search_for_url(self, dependency: URLDependency) -> Package:

self.validate_package_for_dependency(dependency=dependency, package=package)

for extra in dependency.extras:
for extra in sorted(dependency.extras):
if extra in package.extras:
for dep in package.extras[extra]:
dep.activate()
Expand Down Expand Up @@ -487,7 +487,7 @@ def complete_package(
if dependency.extras:
# Find all the optional dependencies that are wanted - taking care to allow
# for self-referential extras.
stack = list(dependency.extras)
stack = sorted(dependency.extras)
while stack:
extra = stack.pop()
if extra in found_extras:
Expand All @@ -497,16 +497,14 @@ def complete_package(
extra_dependencies = package.extras.get(extra, [])
for extra_dependency in extra_dependencies:
if extra_dependency.name == dependency.name:
stack += list(extra_dependency.extras)
stack += sorted(extra_dependency.extras)
else:
optional_dependencies.add(extra_dependency.name)

# If some extras/features were required, we need to add a special dependency
# representing the base package to the current package.

dependency_package = dependency_package.with_features(
list(dependency.extras)
)
dependency_package = dependency_package.with_features(dependency.extras)
package = dependency_package.package
dependency = dependency_package.dependency
new_dependency = package.without_features().to_dependency()
Expand Down
Loading