TYP: Update typing for 3.10 (#61453)

* update typing for 3.10

* add 2 more TypeAlias

* add 2 more TypeAlias

* fix hook for stubtest - make it work on Windows. remove combine from nattype.pyi

Author: Dr-Irv

.pre-commit-config.yaml

@@ -140,7 +140,7 @@ repos:
         pass_filenames: false
         types: [python]
         stages: [manual]
-    -   id: mypy
+    -   id: stubtest
         # note: assumes python env is setup and activated
         # note: requires pandas dev to be installed
         name: mypy (stubtest)

pandas/_libs/arrays.pyi

@@ -1,4 +1,4 @@
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 

pandas/_libs/hashtable.pyi

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

pandas/_libs/internals.pyi

@@ -1,6 +1,8 @@
-from typing import (
+from collections.abc import (
     Iterator,
     Sequence,
+)
+from typing import (
     final,
     overload,
 )

pandas/_libs/json.pyi

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

pandas/_libs/lib.pyi

@@ -1,12 +1,14 @@
 # TODO(npdtypes): Many types specified here can be made more specific/accurate;
 #  the more specific versions are specified in comments
+from collections.abc import (
+    Callable,
+    Generator,
+    Hashable,
+)
 from decimal import Decimal
 from typing import (
     Any,
-    Callable,
     Final,
-    Generator,
-    Hashable,
     Literal,
     TypeAlias,
     overload,

pandas/_libs/ops.pyi

@@ -1,7 +1,9 @@
-from typing import (
-    Any,
+from collections.abc import (
     Callable,
     Iterable,
+)
+from typing import (
+    Any,
     Literal,
     TypeAlias,
     overload,

pandas/_libs/parsers.pyi

@@ -1,5 +1,5 @@
+from collections.abc import Hashable
 from typing import (
-    Hashable,
     Literal,
 )
 

pandas/_libs/properties.pyi

@@ -1,5 +1,5 @@
+from collections.abc import Sequence
 from typing import (
-    Sequence,
     overload,
 )
 

pandas/_libs/sparse.pyi

@@ -1,4 +1,4 @@
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 

pandas/_libs/testing.pyi

@@ -1,4 +1,4 @@
-from typing import Mapping
+from collections.abc import Mapping
 
 def assert_dict_equal(a: Mapping, b: Mapping, compare_keys: bool = ...) -> bool: ...
 def assert_almost_equal(

pandas/_libs/tslibs/nattype.pyi

@@ -1,7 +1,5 @@
 from datetime import (
-    date as date_,
     datetime,
-    time as time_,
     timedelta,
     tzinfo as _tzinfo,
 )
@@ -99,7 +97,6 @@ class NaTType:
         ambiguous: bool | Literal["raise"] | NaTType = ...,
         nonexistent: TimestampNonexistent = ...,
     ) -> NaTType: ...
-    def combine(cls, date: date_, time: time_) -> NoReturn: ...
     @property
     def tzinfo(self) -> None: ...
     @property

pandas/_libs/tslibs/offsets.pyi

@@ -1,11 +1,11 @@
+from collections.abc import Collection
 from datetime import (
     datetime,
     time,
     timedelta,
 )
 from typing import (
     Any,
-    Collection,
     Literal,
     TypeVar,
     overload,

pandas/_libs/tslibs/timezones.pyi

@@ -1,8 +1,8 @@
+from collections.abc import Callable
 from datetime import (
     datetime,
     tzinfo,
 )
-from typing import Callable
 
 import numpy as np
 

pandas/_libs/tslibs/tzconversion.pyi

@@ -1,8 +1,8 @@
+from collections.abc import Iterable
 from datetime import (
     timedelta,
     tzinfo,
 )
-from typing import Iterable
 
 import numpy as np
 

pandas/_libs/window/aggregations.pyi

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

pandas/_libs/window/aggregations.pyx

@@ -1354,8 +1354,8 @@ def roll_quantile(const float64_t[:] values, ndarray[int64_t] start,
                     if interpolation_type == LINEAR:
                         vlow = skiplist_get(skiplist, idx, &ret)
                         vhigh = skiplist_get(skiplist, idx + 1, &ret)
-                        output[i] = ((vlow + (vhigh - vlow) *
-                                      (idx_with_fraction - idx)))
+                        output[i] = (vlow + (vhigh - vlow) *
+                                     (idx_with_fraction - idx))
                     elif interpolation_type == LOWER:
                         output[i] = skiplist_get(skiplist, idx, &ret)
                     elif interpolation_type == HIGHER:

pandas/_testing/contexts.py

@@ -3,6 +3,7 @@
 from contextlib import contextmanager
 import os
 from pathlib import Path
+import sys
 import tempfile
 from typing import (
     IO,
@@ -81,7 +82,9 @@ def setTZ(tz) -> None:
                     pass
             else:
                 os.environ["TZ"] = tz
-                time.tzset()
+                # Next line allows typing checks to pass on Windows
+                if sys.platform != "win32":
+                    time.tzset()
 
     orig_tz = os.environ.get("TZ")
     setTZ(tz)