TYP: update mypy and small pyi fixes from ruff (#54085)

* TYP: update mypy and small pyi fixes from ruff

* fix errors

* use pyright ignore comment (would prefer 'as TypeGuard')

* disable PLC0414

* Revert "disable PLC0414"

This reverts commit c0f7b2b.

Author: twoertwein

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
     hooks:
       - id: black
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.275
+    rev: v0.0.277
     hooks:
     -   id: ruff
         args: [--exit-non-zero-on-fix]
@@ -130,7 +130,7 @@ repos:
         types: [python]
         stages: [manual]
         additional_dependencies: &pyright_dependencies
-        - pyright@1.1.292
+        - pyright@1.1.296
     -   id: pyright_reportGeneralTypeIssues
         # note: assumes python env is setup and activated
         name: pyright reportGeneralTypeIssues

doc/source/whatsnew/v2.1.0.rst

@@ -171,7 +171,7 @@ If installed, we now require:
 +=================+=================+==========+=========+
 | numpy           | 1.21.6          |    X     |    X    |
 +-----------------+-----------------+----------+---------+
-| mypy (dev)      | 1.2             |          |    X    |
+| mypy (dev)      | 1.4.1           |          |    X    |
 +-----------------+-----------------+----------+---------+
 | beautifulsoup4  | 4.11.1          |          |    X    |
 +-----------------+-----------------+----------+---------+

environment.yml

@@ -76,7 +76,7 @@ dependencies:
 
   # code checks
   - flake8=6.0.0  # run in subprocess over docstring examples
-  - mypy=1.2  # pre-commit uses locally installed mypy
+  - mypy=1.4.1  # pre-commit uses locally installed mypy
   - tokenize-rt  # scripts/check_for_inconsistent_pandas_namespace.py
   - pre-commit>=2.15.0
 

pandas/_libs/lib.pyi

@@ -30,7 +30,7 @@ from enum import Enum
 class _NoDefault(Enum):
     no_default = ...
 
-no_default: Final = _NoDefault.no_default  # noqa: PYI015
+no_default: Final = _NoDefault.no_default
 NoDefault = Literal[_NoDefault.no_default]
 
 i8max: int

pandas/_libs/sas.pyi

@@ -1,7 +1,4 @@
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from pandas.io.sas.sas7bdat import SAS7BDATReader
+from pandas.io.sas.sas7bdat import SAS7BDATReader
 
 class Parser:
     def __init__(self, parser: SAS7BDATReader) -> None: ...

pandas/_typing.py

@@ -84,14 +84,14 @@
     NumpySorter = Optional[npt._ArrayLikeInt_co]  # type: ignore[name-defined]
 
     if sys.version_info >= (3, 10):
-        from typing import TypeGuard
+        from typing import TypeGuard  # pyright: ignore[reportUnusedImport]
     else:
-        from typing_extensions import TypeGuard  # pyright: reportUnusedImport = false
+        from typing_extensions import TypeGuard  # pyright: ignore[reportUnusedImport]
 
     if sys.version_info >= (3, 11):
         from typing import Self
     else:
-        from typing_extensions import Self  # pyright: reportUnusedImport = false
+        from typing_extensions import Self  # pyright: ignore[reportUnusedImport]
 else:
     npt: Any = None
     Self: Any = None

pandas/core/dtypes/missing.py

@@ -46,6 +46,8 @@
 from pandas.core.dtypes.inference import is_list_like
 
 if TYPE_CHECKING:
+    from re import Pattern
+
     from pandas._typing import (
         ArrayLike,
         DtypeObj,
@@ -69,7 +71,7 @@
 
 
 @overload
-def isna(obj: Scalar) -> bool:
+def isna(obj: Scalar | Pattern) -> bool:
     ...
 
 

pandas/core/series.py

@@ -18,7 +18,6 @@
     Any,
     Callable,
     Literal,
-    Union,
     cast,
     overload,
 )
@@ -3459,7 +3458,7 @@ def sort_values(
         self,
         *,
         axis: Axis = ...,
-        ascending: bool | int | Sequence[bool] | Sequence[int] = ...,
+        ascending: bool | Sequence[bool] = ...,
         inplace: Literal[False] = ...,
         kind: SortKind = ...,
         na_position: NaPosition = ...,
@@ -3473,7 +3472,7 @@ def sort_values(
         self,
         *,
         axis: Axis = ...,
-        ascending: bool | int | Sequence[bool] | Sequence[int] = ...,
+        ascending: bool | Sequence[bool] = ...,
         inplace: Literal[True],
         kind: SortKind = ...,
         na_position: NaPosition = ...,
@@ -3482,11 +3481,25 @@ def sort_values(
     ) -> None:
         ...
 
+    @overload
+    def sort_values(
+        self,
+        *,
+        axis: Axis = ...,
+        ascending: bool | Sequence[bool] = ...,
+        inplace: bool = ...,
+        kind: SortKind = ...,
+        na_position: NaPosition = ...,
+        ignore_index: bool = ...,
+        key: ValueKeyFunc = ...,
+    ) -> Series | None:
+        ...
+
     def sort_values(
         self,
         *,
         axis: Axis = 0,
-        ascending: bool | int | Sequence[bool] | Sequence[int] = True,
+        ascending: bool | Sequence[bool] = True,
         inplace: bool = False,
         kind: SortKind = "quicksort",
         na_position: NaPosition = "last",
@@ -3647,7 +3660,7 @@ def sort_values(
             )
 
         if is_list_like(ascending):
-            ascending = cast(Sequence[Union[bool, int]], ascending)
+            ascending = cast(Sequence[bool], ascending)
             if len(ascending) != 1:
                 raise ValueError(
                     f"Length of ascending ({len(ascending)}) must be 1 for Series"

requirements-dev.txt

@@ -53,7 +53,7 @@ moto
 flask
 asv>=0.5.1
 flake8==6.0.0
-mypy==1.2
+mypy==1.4.1
 tokenize-rt
 pre-commit>=2.15.0
 gitpython

typings/numba.pyi

@@ -1,16 +1,14 @@
 # pyright: reportIncompleteStub = false
 from typing import (
-    TYPE_CHECKING,
     Any,
     Callable,
     Literal,
     overload,
 )
 
-if TYPE_CHECKING:
-    import numba
+import numba
 
-    from pandas._typing import F
+from pandas._typing import F
 
 def __getattr__(name: str) -> Any: ...  # incomplete
 @overload