Skip to content

Commit

Permalink
revert initial try
Browse files Browse the repository at this point in the history
  • Loading branch information
radoering committed Apr 13, 2024
1 parent 5f60d36 commit e6709a6
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 28 deletions.
3 changes: 0 additions & 3 deletions src/poetry/mixology/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,17 @@
if TYPE_CHECKING:
from poetry.core.packages.package import Package
from poetry.core.packages.project_package import ProjectPackage
from poetry.core.version.markers import BaseMarker


class SolverResult:
def __init__(
self,
root: ProjectPackage,
packages: list[Package],
transitive_markers: dict[str, BaseMarker],
attempted_solutions: int,
) -> None:
self._root = root
self._packages = packages
self.transitive_markers = transitive_markers
self._attempted_solutions = attempted_solutions

@property
Expand Down
21 changes: 0 additions & 21 deletions src/poetry/mixology/version_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@
from typing import Tuple

from poetry.core.packages.dependency import Dependency
from poetry.core.version.markers import BaseMarker
from poetry.core.version.markers import EmptyMarker

from poetry.mixology.failure import SolveFailure
from poetry.mixology.incompatibility import Incompatibility
from poetry.mixology.incompatibility_cause import ConflictCause
from poetry.mixology.incompatibility_cause import DependencyCause
from poetry.mixology.incompatibility_cause import NoVersionsCause
from poetry.mixology.incompatibility_cause import RootCause
from poetry.mixology.partial_solution import PartialSolution
Expand Down Expand Up @@ -547,30 +544,12 @@ def _result(self) -> SolverResult:
"""
decisions = self._solution.decisions

transitive_markers = self._get_transitive_markers()

return SolverResult(
self._root,
[p for p in decisions if not p.is_root()],
transitive_markers,
self._solution.attempted_solutions,
)

def _get_transitive_markers(self) -> dict[str, BaseMarker]:
transitive_markers: dict[str, BaseMarker] = {}
for incompatibility in self._contradicted_incompatibilities:
# We are only interested in the transitive markers of dependencies
# of the second term of dependency causes.
if isinstance(incompatibility.cause, DependencyCause):
assert len(incompatibility._terms) == 2

dep = incompatibility._terms[1].dependency
transitive_markers[dep.name] = transitive_markers.get(
dep.name, EmptyMarker()
).union(dep.transitive_marker)

return transitive_markers

def _add_incompatibility(self, incompatibility: Incompatibility) -> None:
self._log(f"fact: {incompatibility}")

Expand Down
3 changes: 1 addition & 2 deletions tests/packages/test_locker.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from poetry.core.packages.dependency_group import MAIN_GROUP
from poetry.core.packages.package import Package
from poetry.core.packages.project_package import ProjectPackage
from poetry.core.version.markers import AnyMarker

from poetry.__version__ import __version__
from poetry.factory import Factory
Expand Down Expand Up @@ -50,7 +49,7 @@ def root() -> ProjectPackage:

@pytest.fixture
def solver_info() -> SolverPackageInfo:
return SolverPackageInfo(0, {MAIN_GROUP}, AnyMarker())
return SolverPackageInfo(0, {MAIN_GROUP}, {})


def test_lock_file_data_is_ordered(
Expand Down
3 changes: 1 addition & 2 deletions tests/puzzle/test_transaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from typing import Any

from poetry.core.packages.package import Package
from poetry.core.version.markers import AnyMarker

from poetry.installation.operations.update import Update
from poetry.puzzle.solver import SolverPackageInfo
Expand All @@ -16,7 +15,7 @@


def get_solver_info(depth: int) -> SolverPackageInfo:
return SolverPackageInfo(depth, set(), AnyMarker())
return SolverPackageInfo(depth, set(), {})


def check_operations(ops: list[Operation], expected: list[dict[str, Any]]) -> None:
Expand Down

0 comments on commit e6709a6

Please sign in to comment.