Replace IndexedSet with Sequence / tuple; additional typing tweaks

conda_libmamba_solver/solver.py

@@ -63,7 +63,6 @@
 if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping, Sequence
 
-    from boltons.setutils import IndexedSet
     from conda.auxlib import _Null
     from conda.base.constants import (
         DepsModifier,
@@ -139,7 +138,7 @@ def solve_final_state(
         ignore_pinned: bool | _Null = NULL,
         force_remove: bool | _Null = NULL,
         should_retry_solve: bool = False,
-    ) -> IndexedSet[PackageRecord]:
+    ) -> Sequence[PackageRecord]:
         self._log_info()
         in_state = SolverInputState(
             prefix=self.prefix,
@@ -301,14 +300,14 @@ def _solving_loop(
         in_state: SolverInputState,
         out_state: SolverOutputState,
         index: LibMambaIndexHelper,
-    ) -> IndexedSet[PackageRecord]:
+    ) -> SolverOutputState:
+        solved = False
         for attempt in range(1, self._max_attempts(in_state) + 1):
             try:
                 solved, outcome = self._solve_attempt(in_state, out_state, index, attempt=attempt)
                 if solved:
                     break
             except (UnsatisfiableError, PackagesNotFoundError):
-                solved = False
                 break  # try with last attempt
             else:  # didn't solve yet, but can retry
                 out_state = SolverOutputState(

conda_libmamba_solver/state.py

@@ -67,7 +67,6 @@
 from types import MappingProxyType
 from typing import TYPE_CHECKING
 
-from boltons.setutils import IndexedSet
 from conda.auxlib import NULL
 from conda.base.constants import DepsModifier, UpdateModifier
 from conda.base.context import context
@@ -82,7 +81,7 @@
 from conda.models.prefix_graph import PrefixGraph
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable
+    from collections.abc import Iterable, Sequence
     from os import PathLike
     from typing import Any
 
@@ -472,12 +471,12 @@ def __init__(
         self.pins: dict[str, MatchSpec] = pins or {}
 
     @property
-    def current_solution(self) -> IndexedSet[PackageRecord]:
+    def current_solution(self) -> Sequence[PackageRecord]:
         """
         Massage currently stored records so they can be returned as the type expected by the
         solver API. This is what you should return in ``Solver.solve_final_state()``.
         """
-        return IndexedSet(PrefixGraph(self.records.values()).graph)
+        return tuple(PrefixGraph(self.records.values()).graph)
 
     @property
     def specs(self) -> dict[str, MatchSpec]:
@@ -519,7 +518,7 @@ def virtual_specs(self) -> dict[str, MatchSpec]:
         """
         return {name: spec for name, spec in self.specs.items() if name.startswith("__")}
 
-    def early_exit(self) -> IndexedSet[PackageRecord] | None:
+    def early_exit(self) -> Sequence[PackageRecord] | None:
         """
         Operations that do not need a solver and might result in returning
         early are collected here.

dev/requirements.txt

@@ -1,7 +1,6 @@
 # build-time
 pip
 # run-time
-boltons>=23.0.0
 conda>=26.1
 conda-forge::libmamba>=2.0.0
 conda-forge::libmambapy>=2.0.0

news/drop-indexedset

@@ -0,0 +1,20 @@
+### Enhancements
+
+* <news item>
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* Replace `IndexedSet` with simple de-duplication using builtins. Drop `boltons`
+  dependency. Requires an unreleased version of conda.

pyproject.toml

@@ -23,9 +23,8 @@ classifiers = [
 ]
 requires-python = ">=3.10"
 dependencies = [
-  "conda >=26.1",
+  "conda >=26.5",
   # "libmambapy >=2",
-  "boltons >=23.0.0",
   "msgpack >=1.1.1",
   "requests >=2.28.0,<3",
   "zstandard >=0.15"

recipe/meta.yaml

@@ -21,9 +21,8 @@ requirements:
     - hatch-vcs
   run:
     - python >=3.10
-    - conda >=26.1
+    - conda >=26.5
     - libmambapy >=2.0.0
-    - boltons >=23.0.0
     - msgpack-python >=1.1.1
     - requests >=2.28.0,<3
     - zstandard >=0.15