refactor: comply to more ruff and pyright rules

.pre-commit-config.yaml

@@ -14,14 +14,7 @@ repos:
     rev: v0.13.3
     hooks:
     -   id: ruff-check
-        args: [
-          --exit-non-zero-on-fix,
-          --target-version, py39,
-          --extend-select, "PYI,UP,RUF100",
-          --ignore, "E501,E731,F841,PYI042",
-          --per-file-ignores, "_*.pyi:PYI001",
-          --fix
-        ]
+        args: [--exit-non-zero-on-fix]
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
     hooks:

pandas-stubs/_libs/lib.pyi

@@ -2,14 +2,12 @@ from enum import Enum
 from typing import (
     Final,
     Literal,
-)
-
-import numpy as np
-from typing_extensions import (
     TypeAlias,
     TypeGuard,
 )
 
+import numpy as np
+
 class _NoDefault(Enum):
     no_default = ...
 

pandas-stubs/_libs/missing.pyi

@@ -1,6 +1,6 @@
+from collections.abc import Callable
 from typing import (
     Any,
-    Callable,
     Literal,
     overload,
 )

pandas-stubs/_libs/tslibs/nattype.pyi

@@ -4,12 +4,14 @@ from datetime import (
     timedelta,
     tzinfo as _tzinfo,
 )
-from typing import Literal
+from typing import (
+    Literal,
+    TypeAlias,
+)
 
 import numpy as np
 from typing_extensions import (
     Self,
-    TypeAlias,
 )
 
 from pandas._libs.tslibs.period import Period

pandas-stubs/_libs/tslibs/period.pyi

@@ -1,6 +1,7 @@
 import datetime
 from typing import (
     Literal,
+    TypeAlias,
     overload,
 )
 
@@ -12,7 +13,6 @@ from pandas import (
     Timedelta,
     TimedeltaIndex,
 )
-from typing_extensions import TypeAlias
 
 from pandas._libs.tslibs import NaTType
 from pandas._libs.tslibs.offsets import BaseOffset

pandas-stubs/_libs/tslibs/timedeltas.pyi

@@ -5,6 +5,7 @@ from typing import (
     ClassVar,
     Literal,
     NamedTuple,
+    TypeAlias,
     overload,
 )
 
@@ -19,7 +20,6 @@ from pandas import (
 )
 from typing_extensions import (
     Self,
-    TypeAlias,
 )
 
 from pandas._libs.tslibs import (

pandas-stubs/_libs/tslibs/timestamps.pyi

@@ -13,6 +13,7 @@ from typing import (
     ClassVar,
     Literal,
     SupportsIndex,
+    TypeAlias,
     overload,
 )
 
@@ -26,7 +27,6 @@ from pandas.core.series import Series
 from typing_extensions import (
     Never,
     Self,
-    TypeAlias,
 )
 
 from pandas._libs.tslibs import (

pandas-stubs/_typing.pyi

@@ -19,6 +19,7 @@ from typing import (
     Literal,
     Protocol,
     SupportsIndex,
+    TypeAlias,
     TypedDict,
     Union,
     overload,
@@ -36,7 +37,6 @@ from pandas.core.series import Series
 from pandas.core.tools.datetimes import FulldatetimeDict
 from typing_extensions import (
     ParamSpec,
-    TypeAlias,
     TypeVar,
     override,
 )

pandas-stubs/core/accessor.pyi

@@ -1,4 +1,4 @@
-from typing import Callable
+from collections.abc import Callable
 
 from pandas._typing import TypeT
 

pandas-stubs/core/arrays/datetimelike.pyi

@@ -1,5 +1,8 @@
 from collections.abc import Sequence
-from typing import overload
+from typing import (
+    TypeAlias,
+    overload,
+)
 
 import numpy as np
 from pandas.core.arrays.base import (
@@ -8,7 +11,6 @@ from pandas.core.arrays.base import (
 )
 from typing_extensions import (
     Self,
-    TypeAlias,
 )
 
 from pandas._libs import (

pandas-stubs/core/arrays/interval.pyi

@@ -1,4 +1,7 @@
-from typing import overload
+from typing import (
+    TypeAlias,
+    overload,
+)
 
 import numpy as np
 from pandas import (
@@ -8,7 +11,6 @@ from pandas import (
 from pandas.core.arrays.base import ExtensionArray as ExtensionArray
 from typing_extensions import (
     Self,
-    TypeAlias,
 )
 
 from pandas._libs.interval import (

pandas-stubs/core/dtypes/common.pyi

@@ -1,6 +1,7 @@
+from typing import TypeAlias
+
 import pandas as pd
 from pandas.api.extensions import ExtensionDtype
-from typing_extensions import TypeAlias
 
 from pandas._typing import (
     ArrayLike,

pandas-stubs/core/dtypes/generic.pyi

@@ -1,6 +1,7 @@
+from typing import TypeAlias
+
 from pandas import Series
 from pandas.core.arrays import ExtensionArray
-from typing_extensions import TypeAlias
 
 ABCSeries: TypeAlias = type[Series]
 ABCExtensionArray: TypeAlias = type[ExtensionArray]

pandas-stubs/core/frame.pyi

@@ -23,6 +23,7 @@ from typing import (
     Generic,
     Literal,
     NoReturn,
+    TypeAlias,
     TypeVar,
     final,
     overload,
@@ -73,7 +74,6 @@ from pandas.core.window.rolling import (
 from typing_extensions import (
     Never,
     Self,
-    TypeAlias,
 )
 import xarray as xr
 

pandas-stubs/core/generic.pyi

@@ -14,6 +14,7 @@ import sqlite3
 from typing import (
     Any,
     ClassVar,
+    Concatenate,
     Literal,
     final,
     overload,
@@ -28,7 +29,7 @@ from pandas.core.series import (
 )
 import sqlalchemy.engine
 from typing_extensions import (
-    Concatenate,
+    Never,
     Self,
 )
 
@@ -315,6 +316,42 @@ class NDFrame(indexing.IndexingMixin):
     @final
     def __delitem__(self, idx: Hashable) -> None: ...
     @overload
+    def drop(
+        self,
+        labels=...,
+        *,
+        axis=...,
+        index: None,
+        columns=...,
+        level=...,
+        inplace=...,
+        errors=...,
+    ) -> Never: ...
+    @overload
+    def drop(
+        self,
+        labels=...,
+        *,
+        axis=...,
+        index=...,
+        columns: None,
+        level=...,
+        inplace=...,
+        errors=...,
+    ) -> Never: ...
+    @overload
+    def drop(
+        self,
+        labels: None,
+        *,
+        axis=...,
+        index=...,
+        columns=...,
+        level=...,
+        inplace=...,
+        errors=...,
+    ) -> Never: ...
+    @overload
     def drop(
         self,
         labels: None = ...,

pandas-stubs/core/groupby/generic.pyi

@@ -12,6 +12,7 @@ from typing import (
     Literal,
     NamedTuple,
     Protocol,
+    TypeAlias,
     TypeVar,
     final,
     overload,
@@ -28,7 +29,6 @@ from pandas.core.groupby.groupby import (
 from pandas.core.series import Series
 from typing_extensions import (
     Self,
-    TypeAlias,
 )
 
 from pandas._libs.tslibs.timestamps import Timestamp

pandas-stubs/core/groupby/groupby.pyi

@@ -8,8 +8,10 @@ from collections.abc import (
 import datetime as dt
 from typing import (
     Any,
+    Concatenate,
     Generic,
     Literal,
+    TypeAlias,
     TypeVar,
     final,
     overload,
@@ -39,9 +41,7 @@ from pandas.core.window import (
     RollingGroupby,
 )
 from typing_extensions import (
-    Concatenate,
     Self,
-    TypeAlias,
 )
 
 from pandas._libs.lib import _NoDefaultDoNotUse

pandas-stubs/core/indexes/interval.pyi

@@ -5,6 +5,7 @@ from collections.abc import (
 import datetime as dt
 from typing import (
     Literal,
+    TypeAlias,
     final,
     overload,
 )
@@ -13,7 +14,6 @@ import numpy as np
 import pandas as pd
 from pandas import Index
 from pandas.core.indexes.extension import ExtensionIndex
-from typing_extensions import TypeAlias
 
 from pandas._libs.interval import (
     Interval as Interval,

pandas-stubs/core/indexing.pyi

@@ -1,7 +1,9 @@
-from typing import TypeVar
+from typing import (
+    TypeAlias,
+    TypeVar,
+)
 
 from pandas.core.indexes.api import Index
-from typing_extensions import TypeAlias
 
 from pandas._libs.indexing import _NDFrameIndexerBase
 from pandas._typing import (

pandas-stubs/core/resample.pyi

@@ -5,6 +5,7 @@ from collections.abc import (
 )
 from typing import (
     Literal,
+    TypeAlias,
     final,
     overload,
 )
@@ -20,7 +21,6 @@ from pandas.core.groupby.groupby import BaseGroupBy
 from pandas.core.groupby.grouper import Grouper
 from typing_extensions import (
     Self,
-    TypeAlias,
 )
 
 from pandas._typing import (

pandas-stubs/core/reshape/concat.pyi

@@ -160,7 +160,7 @@ def concat(
 #     verify_integrity: bool = ...,
 #     sort: bool = ...,
 #     copy: bool = ...,
-# ) -> Union[DataFrame, Series]: ...
+# ) -> DataFrame | Series: ...
 
 # @overload
 # def concat(
@@ -176,4 +176,4 @@ def concat(
 #     verify_integrity: bool = ...,
 #     sort: bool = ...,
 #     copy: bool = ...,
-# ) -> Union[DataFrame, Series]: ...
+# ) -> DataFrame | Series: ...

pandas-stubs/core/reshape/pivot.pyi

@@ -7,6 +7,7 @@ from collections.abc import (
 import datetime
 from typing import (
     Literal,
+    TypeAlias,
     overload,
 )
 
@@ -16,7 +17,6 @@ from pandas.core.frame import DataFrame
 from pandas.core.groupby.grouper import Grouper
 from pandas.core.indexes.base import Index
 from pandas.core.series import Series
-from typing_extensions import TypeAlias
 
 from pandas._typing import (
     AnyArrayLike,

pandas-stubs/core/series.pyi

@@ -27,6 +27,7 @@ from typing import (
     Literal,
     NoReturn,
     Protocol,
+    TypeAlias,
     TypeVar,
     final,
     overload,
@@ -96,7 +97,6 @@ from pandas.core.window.rolling import (
 from typing_extensions import (
     Never,
     Self,
-    TypeAlias,
 )
 import xarray as xr