Merge pull request #20 from baszalmstra/refactor/remove_self_type

remove self type

.github/workflows/type-check.yml

@@ -0,0 +1,21 @@
+# name: Run updater that will check for conda-forge packages
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+
+jobs:
+  run_tests:
+    runs-on: ubuntu-latest
+
+    steps:
+        - uses: actions/checkout@v4
+
+        - uses: prefix-dev/[email protected]
+          with:
+            pixi-version: "latest"
+            environments: lint
+
+        - name: type check
+          run: |
+            pixi run type-check

pixi.toml

@@ -11,14 +11,15 @@ platforms = ["win-64", "linux-64", "osx-64", "osx-arm64"]
 build_sdist = "pixi run python -m build --sdist"
 
 [dependencies]
-python = ">=3.8"
+python = ">=3.10"
 build = "*"
 rattler-build = "*"
 conda-build = "*"
 "ruamel.yaml" = "*"
 conda = ">=4.2"
 pygithub = ">=2,<3"
 tomli = "*"
+typing-extensions = ">=4.12.2,<4.13"
 
 [pypi-dependencies]
 rattler-build-conda-compat = { path = ".", editable = true}
@@ -39,10 +40,13 @@ pre-commit = ">=3.7.1,<4"
 pre-commit-hooks = ">=4.6.0,<5"
 ruff = ">=0.4.8,<0.5"
 typos = ">=1.23.1,<2"
+mypy = ">=1.10.1,<2"
+types-pyyaml = ">=6.0.12.20240311,<6.0.13"
 
 [feature.lint.tasks]
 pre-commit-install = "pre-commit-install"
 pre-commit-run = "pre-commit run"
+type-check = "mypy src"
 
 
 [environments]

pyproject.toml

@@ -9,11 +9,13 @@ version = "0.1.2"
 readme = "README.md"
 authors = [{ name = "Nichita Morcotilo", email = "[email protected]" }]
 license = { file = "LICENSE.txt" }
-
-requires-python = ">=3.8"
+dependencies = [
+    "typing-extensions>=4.12,<5"
+]
+requires-python = ">=3.10"
 
 [tool.ruff]
-target-version = "py38"
+target-version = "py310"
 line-length = 100
 
 [tool.ruff.format]
@@ -30,6 +32,7 @@ ignore = [
     "T201",   # https://docs.astral.sh/ruff/rules/print/
     "A003",   # https://docs.astral.sh/ruff/rules/builtin-attribute-shadowing/
     "PTH",    # We dont want to change the API to pathlib just yet
+    "ANN101"  # Deprecated
 ]
 exclude = [
     "src/rattler_build_conda_compat/lint.py",
@@ -43,3 +46,7 @@ exclude = [
 [tool.pyright]
 venvPath = ".pixi/envs"
 venv = "default"
+
+[tool.mypy]
+python_version = "3.10"
+allow_redefinition = true

src/rattler_build_conda_compat/conditional_list.py

@@ -1,8 +1,12 @@
 from __future__ import annotations
 
-from typing import Any, Callable, Generator, Generic, TypeVar, Union
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, Union, cast
+
+if TYPE_CHECKING:
+    from collections.abc import Callable, Generator
 
 T = TypeVar("T")
+K = TypeVar("K")
 
 
 class IfStatement(Generic[T]):
@@ -11,11 +15,12 @@ class IfStatement(Generic[T]):
     else_: T | list[T] | None
 
 
-ConditionalList = Union[T, "IfStatement[T]", list[Union[T, "IfStatement[T]"]]]
+ConditionalList = Union[T, IfStatement[T], list[T | IfStatement[T]]]  # noqa: UP007
 
 
 def visit_conditional_list(  # noqa: C901
-    value: ConditionalList[T], evaluator: Callable[[Any], bool] | None = None
+    value: T | IfStatement[T] | list[T | IfStatement[T]],
+    evaluator: Callable[[Any], bool] | None = None,
 ) -> Generator[T, None, None]:
     """
     A function that yields individual branches of a conditional list.
@@ -30,7 +35,7 @@ def visit_conditional_list(  # noqa: C901
     A generator that yields the individual branches.
     """
 
-    def yield_from_list(value: list[T] | T) -> Generator[T, None, None]:
+    def yield_from_list(value: list[K] | K) -> Generator[K, None, None]:
         if isinstance(value, list):
             yield from value
         else:
@@ -57,8 +62,8 @@ def yield_from_list(value: list[T] | T) -> Generator[T, None, None]:
                         yield from yield_from_list(otherwise)
             else:
                 # In this case its not an if statement
-                yield element
+                yield cast(T, element)
         # If the element is not a dictionary, just yield it
         else:
             # (tim) I get a pyright error here, but I don't know how to fix it
-            yield element
+            yield cast(T, element)

src/rattler_build_conda_compat/lint.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import re
 
 from inspect import cleandoc

src/rattler_build_conda_compat/loader.py

@@ -1,31 +1,34 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Any, Iterator, Self
+from typing import TYPE_CHECKING, Any
 
 import yaml
 
 from rattler_build_conda_compat.conditional_list import visit_conditional_list
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
     from os import PathLike
 
 
 class RecipeLoader(yaml.BaseLoader):
+    _namespace: dict[str, Any] | None = None
+
     @classmethod
     @contextmanager
-    def with_namespace(cls: Self, namespace: dict[str, Any] | None) -> Iterator[None]:
+    def with_namespace(cls: type[RecipeLoader], namespace: dict[str, Any] | None) -> Iterator[None]:
         try:
             cls._namespace = namespace
             yield
         finally:
             del cls._namespace
 
     def construct_sequence(  # noqa: C901
-        self: Self,
-        node: yaml.Node,
+        self,
+        node: yaml.ScalarNode | yaml.SequenceNode | yaml.MappingNode,
         deep: bool = False,  # noqa: FBT002, FBT001
-    ) -> list[yaml.Node]:
+    ) -> list[yaml.ScalarNode]:
         """deep is True when creating an object/mapping recursively,
         in that case want the underlying elements available during construction
         """

src/rattler_build_conda_compat/recipe_sources.py

@@ -1,8 +1,19 @@
+from __future__ import annotations
+
+import sys
 import typing
-from typing import Any, Iterator, Mapping, NotRequired, TypedDict
+from typing import Any, TypedDict
 
 from .conditional_list import ConditionalList, visit_conditional_list
 
+if sys.version_info < (3, 11):
+    from typing_extensions import NotRequired
+else:
+    from typing import NotRequired
+
+if typing.TYPE_CHECKING:
+    from collections.abc import Iterator, Mapping
+
 OptionalUrlList = str | list[str] | None
 
 
@@ -29,10 +40,10 @@ def get_all_url_sources(recipe: Mapping[Any, Any]) -> Iterator[str]:
 
     # Try getting all url top-level sources
     if sources is not None:
-        sources = visit_conditional_list(sources, None)
-        for source in sources:
-            if "url" in source:
-                yield source["url"]
+        source_list = visit_conditional_list(sources, None)
+        for source in source_list:
+            if url := source.get("url"):
+                yield url
 
     outputs = recipe.get("outputs", None)
     if outputs is None:
@@ -44,7 +55,7 @@ def get_all_url_sources(recipe: Mapping[Any, Any]) -> Iterator[str]:
         sources = typing.cast(ConditionalList[Source], sources)
         if sources is None:
             continue
-        sources = visit_conditional_list(sources, None)
-        for source in sources:
-            if "url" in source:
-                yield source["url"]
+        source_list = visit_conditional_list(sources, None)
+        for source in source_list:
+            if url := source.get("url"):
+                yield url

src/rattler_build_conda_compat/render.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from collections import OrderedDict
 import json
 import os
@@ -66,9 +68,10 @@ def render_recipes(self, variants) -> List[Dict]:
         platform_and_arch = f"{self.config.platform}-{self.config.arch}"
 
         try:
-            with tempfile.NamedTemporaryFile(mode="w+") as outfile, tempfile.NamedTemporaryFile(
-                mode="w"
-            ) as variants_file:
+            with (
+                tempfile.NamedTemporaryFile(mode="w+") as outfile,
+                tempfile.NamedTemporaryFile(mode="w") as variants_file,
+            ):
                 # dump variants in our variants that will be used to generate recipe
                 if variants:
                     yaml.dump(variants, variants_file, default_flow_style=False)