Clean up more no-longer version dependent typing

Author: mroeschke

pandas/_libs/lib.pyi

@@ -11,6 +11,7 @@ from typing import (
     Final,
     Literal,
     TypeAlias,
+    TypeGuard,
     overload,
 )
 
@@ -19,7 +20,6 @@ import numpy as np
 from pandas._typing import (
     ArrayLike,
     DtypeObj,
-    TypeGuard,
     npt,
 )
 

pandas/_typing.py

@@ -20,7 +20,9 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    ParamSpec,
     Protocol,
+    SupportsIndex,
     TypeAlias,
     TypeVar,
     Union,
@@ -84,18 +86,8 @@
     # Name "npt._ArrayLikeInt_co" is not defined  [name-defined]
     NumpySorter: TypeAlias = npt._ArrayLikeInt_co | None  # type: ignore[name-defined]
 
-    from typing import (
-        ParamSpec,
-        SupportsIndex,
-    )
-    from typing import Concatenate  # pyright: ignore[reportUnusedImport]
-    from typing import TypeGuard  # pyright: ignore[reportUnusedImport]
-
-    P = ParamSpec("P")
-else:
-    ParamSpec: Any = None
-    TypeGuard: Any = None
-    Concatenate: Any = None
+
+P = ParamSpec("P")
 
 HashableT = TypeVar("HashableT", bound=Hashable)
 HashableT2 = TypeVar("HashableT2", bound=Hashable)

pandas/core/common.py

@@ -25,6 +25,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
+    Concatenate,
     TypeVar,
     cast,
     overload,
@@ -51,7 +52,6 @@
     from pandas._typing import (
         AnyArrayLike,
         ArrayLike,
-        Concatenate,
         NpDtype,
         P,
         RandomState,

pandas/core/dtypes/inference.py

@@ -6,7 +6,10 @@
 from numbers import Number
 import re
 from re import Pattern
-from typing import TYPE_CHECKING
+from typing import (
+    TYPE_CHECKING,
+    TypeGuard,
+)
 
 import numpy as np
 
@@ -15,8 +18,6 @@
 if TYPE_CHECKING:
     from collections.abc import Hashable
 
-    from pandas._typing import TypeGuard
-
 is_bool = lib.is_bool
 
 is_integer = lib.is_integer

pandas/core/generic.py

@@ -14,6 +14,7 @@
     TYPE_CHECKING,
     Any,
     ClassVar,
+    Concatenate,
     Literal,
     NoReturn,
     Self,
@@ -42,7 +43,6 @@
     Axis,
     AxisInt,
     CompressionOptions,
-    Concatenate,
     DtypeArg,
     DtypeBackend,
     DtypeObj,

pandas/core/groupby/groupby.py

@@ -25,6 +25,7 @@ class providing the base-class of operations.
 from textwrap import dedent
 from typing import (
     TYPE_CHECKING,
+    Concatenate,
     Literal,
     Self,
     TypeAlias,
@@ -147,7 +148,6 @@ class providing the base-class of operations.
     from pandas._libs.tslibs.timedeltas import Timedelta
     from pandas._typing import (
         Any,
-        Concatenate,
         P,
         T,
     )

pandas/core/resample.py

@@ -4,6 +4,7 @@
 from textwrap import dedent
 from typing import (
     TYPE_CHECKING,
+    Concatenate,
     Literal,
     Self,
     cast,
@@ -97,7 +98,6 @@
         Any,
         AnyArrayLike,
         Axis,
-        Concatenate,
         FreqIndexT,
         Frequency,
         IndexLabel,

pandas/core/window/expanding.py

@@ -4,6 +4,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
+    Concatenate,
     Literal,
     Self,
     final,
@@ -42,7 +43,6 @@
     from collections.abc import Callable
 
     from pandas._typing import (
-        Concatenate,
         P,
         QuantileInterpolation,
         T,

pandas/core/window/rolling.py

@@ -13,6 +13,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
+    Concatenate,
     Literal,
     Self,
     final,
@@ -110,7 +111,6 @@
 
     from pandas._typing import (
         ArrayLike,
-        Concatenate,
         NDFrameT,
         QuantileInterpolation,
         P,

pandas/io/formats/style.py

@@ -10,6 +10,7 @@
 import textwrap
 from typing import (
     TYPE_CHECKING,
+    Concatenate,
     Self,
     overload,
 )
@@ -67,7 +68,6 @@
         Any,
         Axis,
         AxisInt,
-        Concatenate,
         ExcelWriterMergeCells,
         FilePath,
         IndexLabel,