pre-commit

conda_libmamba_solver/index.py

@@ -111,7 +111,8 @@
 from .mamba_utils import logger_callback
 
 if TYPE_CHECKING:
-    from typing import Iterable, Literal
+    from collections.abc import Iterable
+    from typing import Literal
 
     from conda.gateways.repodata import RepodataState
     from libmambapy import QueryResult

conda_libmamba_solver/solver.py

@@ -16,7 +16,7 @@
 import sys
 from collections import defaultdict
 from contextlib import suppress
-from functools import lru_cache
+from functools import cache
 from inspect import stack
 from textwrap import dedent
 from typing import TYPE_CHECKING
@@ -58,7 +58,7 @@
 from .state import SolverInputState, SolverOutputState
 
 if TYPE_CHECKING:
-    from typing import Iterable, Mapping, Sequence
+    from collections.abc import Iterable, Mapping, Sequence
 
     from boltons.setutils import IndexedSet
     from conda.auxlib import _Null
@@ -77,7 +77,7 @@ class LibMambaSolver(Solver):
     _uses_ssc = False
 
     @staticmethod
-    @lru_cache(maxsize=None)
+    @cache
     def user_agent() -> str:
         """
         Expose this identifier to allow conda to extend its user agent if required

conda_libmamba_solver/state.py

@@ -82,8 +82,9 @@
 from conda.models.prefix_graph import PrefixGraph
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
     from os import PathLike
-    from typing import Any, Iterable
+    from typing import Any
 
     from conda.core.solve import Solver
     from conda.models.records import PackageRecord

conda_libmamba_solver/utils.py

@@ -16,8 +16,8 @@
 from conda.exceptions import PackagesNotFoundError
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
     from enum import Enum
-    from typing import Iterable
 
     from conda.models.match_spec import MatchSpec