Replace mypy with ty

Author: jezdez

.github/workflows/tests.yml

@@ -5,16 +5,16 @@ on:
     branches:
       - main
     paths:
+      - ".pre-commit-config.yaml"
       - ".github/workflows/tests.yml"
       - "conda_self/**"
       - "pixi.lock"
       - "pyproject.toml"
       - "recipe/**"
       - "tests/**"
   pull_request:
-    branches:
-      - main
     paths:
+      - ".pre-commit-config.yaml"
       - ".github/workflows/tests.yml"
       - "conda_self/**"
       - "pixi.lock"
@@ -32,6 +32,16 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  typecheck:
+    name: Type check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: prefix-dev/setup-pixi@f00437f565399d418b0acc85936d12c1fb668347 # v0.10.1
+        with:
+          environments: typecheck
+      - run: pixi run --environment typecheck typecheck
+
   tests:
     name: ${{ matrix.os }}, py${{ matrix.python-version }}, ${{ matrix.channel }}
     runs-on: ${{ matrix.os }}

.pre-commit-config.yaml

@@ -1,6 +1,8 @@
 # disable autofixing PRs, commenting "pre-commit.ci autofix" on a pull request triggers a autofix
 ci:
   autofix_prs: false
+  # GitHub Actions runs ty because pre-commit.ci does not provide Pixi.
+  skip: [ty]
 # generally speaking we ignore all vendored code as well as tests data
 # TODO: Restore index and solver exclude lines before merge
 exclude: |
@@ -41,11 +43,6 @@ repos:
         args: [--fix]
       # compatible replacement for black
       - id: ruff-format
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v2.3.1'  # Use the sha / tag you want to point at
-    hooks:
-    - id: mypy
-      exclude: ^docs/.*$
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.38.0
     hooks:
@@ -57,6 +54,12 @@ repos:
       - id: check-useless-excludes
   - repo: local
     hooks:
+      - id: ty
+        name: ty
+        entry: pixi run --environment typecheck typecheck
+        language: system
+        pass_filenames: false
+        always_run: true
       - id: git-diff
         name: git diff
         entry: git diff --exit-code

conda_self/health_checks/base_protection.py

@@ -137,7 +137,9 @@ def fix(prefix: str, args: Namespace, confirm: ConfirmCallback) -> int:
         )
         if not context.quiet:
             print(f"Saving snapshot to {snapshot_file}")
-        snapshot_file.write_text(explicit_exporter.export(env))
+        export = explicit_exporter.export
+        assert export is not None
+        snapshot_file.write_text(export(env))
     except CondaValueError:
         if not context.quiet:
             print(

conda_self/package_info.py

@@ -18,7 +18,7 @@
 # This is required for reading entry point info from an extracted package
 # ref: https://packaging.python.org/en/latest/specifications/entry-points/#file-format
 class CaseSensitiveConfigParser(configparser.ConfigParser):
-    optionxform = staticmethod(str)  # type: ignore
+    optionxform = staticmethod(str)
 
 
 class PackageInfo:

conda_self/query.py

@@ -9,7 +9,7 @@
 from conda.core.prefix_data import PrefixData
 from conda.models.prefix_graph import PrefixGraph
 
-from .constants import PERMANENT_PACKAGES
+from .constants import PERMANENT_PACKAGES, SELF_PERMANENT_PACKAGES_SETTING
 from .exceptions import NoDistInfoDirFound
 from .package_info import PackageInfo
 
@@ -22,7 +22,10 @@ def permanent_dependencies(add_plugins: bool = False) -> set[str]:
     installed = list(PrefixData(sys.prefix, interoperability=True).iter_records())
     prefix_graph = PrefixGraph(installed)
 
-    protect = [*PERMANENT_PACKAGES, *context.plugins.self_permanent_packages]
+    protect = [
+        *PERMANENT_PACKAGES,
+        *getattr(context.plugins, SELF_PERMANENT_PACKAGES_SETTING),
+    ]
 
     if add_plugins:
         for record in installed:

conda_self/reset.py

@@ -5,7 +5,6 @@
 from os.path import dirname, isfile
 from typing import TYPE_CHECKING
 
-from boltons.setutils import IndexedSet
 from conda import CondaError, CondaExitZero, CondaMultiError
 from conda.base.constants import EXPLICIT_MARKER
 from conda.base.context import context
@@ -30,7 +29,7 @@
 
 def records_from_snapshot(
     prefix: str, snapshot_content: list[str]
-) -> tuple[IndexedSet, tuple[MatchSpec, ...]]:
+) -> tuple[tuple[PackageRecord, ...], tuple[MatchSpec, ...]]:
     """Return package records for the snapshot and MatchSpecs to install or relink."""
     entries = tuple(line for line in snapshot_content if line != EXPLICIT_MARKER)
     try:
@@ -140,9 +139,9 @@ def records_from_snapshot(
         for index, record in zip(unresolved_indices, fetched_records, strict=True):
             records[index] = record
 
-    return IndexedSet(record for record in records if record is not None), tuple(
-        unresolved_specs
-    )
+    return tuple(
+        dict.fromkeys(record for record in records if record is not None)
+    ), tuple(unresolved_specs)
 
 
 def names_from_explicit(path: Path) -> set[str]: