Merge pull request #195 from jorenham/ruff-0.8

`ruff 0.8.0`  and `basedpyright 1.22.0`

Author: jorenham

.github/workflows/ci.yml

@@ -24,13 +24,13 @@ jobs:
           plugins: sp-repo-review
 
       - name: markdownlint
-        uses: DavidAnson/markdownlint-cli2-action@v17
+        uses: DavidAnson/markdownlint-cli2-action@v18
         with:
           config: ".markdownlint.yaml"
           globs: "**/*.md"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
         with:
           enable-cache: true
 
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: setup uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
         with:
           enable-cache: true
 

.pre-commit-config.yaml

@@ -47,7 +47,7 @@ repos:
           - black==24.10.0
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint
 
@@ -59,7 +59,7 @@ repos:
           - tomli
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.8.0
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]

examples/functor.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast, final
+from typing import TYPE_CHECKING, Generic, TypeVar, final
 import optype as o
 
 if sys.version_info >= (3, 12):
@@ -33,10 +33,10 @@ def map1(self, f: Callable[[_T_co], _Y], /) -> Functor[_Y]:
         """
         return Functor(f(self.value))
 
-    def map2(  # type: ignore[no-any-explicit]
+    def map2(
         self,
         f: Callable[[_T_co, _X], _Y],
-        other: Functor[_X] | Any,
+        other: Functor[_X],
         /,
     ) -> Functor[_Y] | NotImplementedType:
         """
@@ -45,10 +45,6 @@ def map2(  # type: ignore[no-any-explicit]
         is returned if `f` is not supported for the types, or if other is not
         a `Functor`.
         """
-        if not isinstance(other, Functor):
-            return NotImplemented
-
-        other = cast(Functor[_X], other)
         y = f(self.value, other.value)
 
         return NotImplemented if y is NotImplemented else Functor(y)

optype/_core/_can.py

@@ -47,7 +47,7 @@
 
 _JustBoolT_co = TypeVar(
     "_JustBoolT_co",
-    Literal[False], Literal[True], Literal[False, True], bool,
+    Literal[False], Literal[True], Literal[False, True], bool,  # noqa: RUF038
     covariant=True,
     default=bool,
 )  # fmt: skip

optype/dlpack.py

@@ -92,7 +92,7 @@ def __dlpack__(  # type: ignore[no-any-explicit]
         dl_device: tuple[_TypeT_co, _DeviceT_co] | None = None,
         # NOTE: This should be `bool | None`, but because of an incorrect annotation in
         # `numpy.ndarray.__dlpack__`, this is not possible at the moment.
-        copy: Any | None = None,
+        copy: Any | None = None,  # pyright: ignore[reportExplicitAny]
     ) -> CapsuleType: ...
 
 

optype/inspect.py

@@ -4,7 +4,7 @@
 import inspect
 import sys
 from types import GenericAlias, UnionType
-from typing import TYPE_CHECKING, Any, Literal, cast, get_args as _get_args
+from typing import TYPE_CHECKING, Any, Literal, TypeAlias, cast, get_args as _get_args
 
 
 if sys.version_info >= (3, 13):
@@ -80,7 +80,7 @@ def is_iterable(obj: object, /) -> TypeIs[AnyIterable]:
 
         # not all sequence-likes implement __len__, e.g. `ctypes.pointer`
         try:
-            obj[0]
+            obj[0]  # pyright: ignore[reportArgumentType]
         except (IndexError, StopIteration):
             pass
         except (KeyError, ValueError, TypeError):
@@ -91,6 +91,9 @@ def is_iterable(obj: object, /) -> TypeIs[AnyIterable]:
     return False
 
 
+_AnyClassMethod: TypeAlias = "classmethod[Any, ..., object]"  # pyright: ignore[reportExplicitAny]
+
+
 @overload
 def is_final(final_cls_or_method: WrappedFinalType, /) -> Literal[True]: ...
 @overload
@@ -101,7 +104,7 @@ def is_final(fn: CanCall[..., object], /) -> bool: ...
 def is_final(prop: property, /) -> bool: ...
 @overload
 def is_final(
-    clsmethod: classmethod[Any, ..., object] | staticmethod[..., object],
+    clsmethod: _AnyClassMethod | staticmethod[..., object],
     /,
 ) -> bool: ...
 def is_final(
@@ -110,7 +113,7 @@ def is_final(
         | type
         | CanCall[..., object]
         | property
-        | classmethod[Any, ..., object]
+        | _AnyClassMethod
         | staticmethod[..., object]
     ),
     /,

optype/numpy/_any_array.py

@@ -83,7 +83,7 @@ class _AnyArrayPY0(Protocol[_T_co]):
     def __len__(self, /) -> int: ...
     def __getitem__(self, i: int, /) -> _T_co | _AnyArrayPY0[_T_co]: ...
     def __reversed__(self, /) -> Iterator[_T_co | _AnyArrayPY0[_T_co]]: ...
-    def index(self, x: Any, /) -> int: ...  # pyright: ignore[reportAny]
+    def index(self, x: Any, /) -> int: ...  # pyright: ignore[reportAny,reportExplicitAny]
 
 
 _AnyArrayPY: TypeAlias = tuple[_T, ...] | _AnyArrayPY0[_T]

optype/numpy/_scalar.py

@@ -105,7 +105,7 @@ def __array__(self, dtype: _DT, /) -> _Array0D[_DT]: ...
 
 
 # `NBitBase` invariant and doesn't actually do anything, so the default should be `Any`
-_N = TypeVar("_N", bound=npt.NBitBase, default=Any)
+_N = TypeVar("_N", bound=npt.NBitBase, default=Any)  # pyright: ignore[reportExplicitAny]
 
 generic = np.generic
 flexible = np.flexible

optype/types/_typeforms.py

@@ -18,8 +18,8 @@ class _C(Generic[_T]): ...
 AnnotatedAlias = type(Annotated[None, None])
 
 # typing._LiteralGenericAlias
-LiteralAlias = type(Literal[None])
+LiteralAlias = type(Literal[0])
 
 # typing._UnionGenericAlias
 # NOTE: this is not the same as `types.UnionType`!
-UnionAlias = type(Literal[None] | None)
+UnionAlias = type(Literal[0] | None)

optype/typing.py

@@ -96,7 +96,7 @@ class _EmptyTypedDict(TypedDict):
 EmptyIterable: TypeAlias = AnyIterable[Never]
 
 
-LiteralBool: TypeAlias = Literal[False, True]
+LiteralBool: TypeAlias = Literal[False, True]  # noqa: RUF038
 LiteralByte: TypeAlias = Literal[
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,