TYP: mypy 0.930 and pyright 1.1.200 (#45067)

Author: twoertwein

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
 
     - name: Install pyright
       # note: keep version in sync with .pre-commit-config.yaml
-      run: npm install -g [email protected].171
+      run: npm install -g [email protected].200
 
     - name: Build Pandas
       uses: ./.github/actions/build_pandas

.pre-commit-config.yaml

@@ -78,7 +78,7 @@ repos:
         types: [python]
         stages: [manual]
         # note: keep version in sync with .github/workflows/ci.yml
-        additional_dependencies: ['[email protected].171']
+        additional_dependencies: ['[email protected].200']
 -   repo: local
     hooks:
     -   id: flake8-rst

doc/source/whatsnew/v1.4.0.rst

@@ -398,7 +398,7 @@ If installed, we now require:
 +-----------------+-----------------+----------+---------+
 | pytest (dev)    | 6.0             |          |         |
 +-----------------+-----------------+----------+---------+
-| mypy (dev)      | 0.920           |          |    X    |
+| mypy (dev)      | 0.930           |          |    X    |
 +-----------------+-----------------+----------+---------+
 
 For `optional libraries <https://pandas.pydata.org/docs/getting_started/install.html>`_ the general recommendation is to use the latest version.

environment.yml

@@ -24,7 +24,7 @@ dependencies:
   - flake8-bugbear=21.3.2  # used by flake8, find likely bugs
   - flake8-comprehensions=3.7.0  # used by flake8, linting of unnecessary comprehensions
   - isort>=5.2.1  # check that imports are in the right order
-  - mypy=0.920
+  - mypy=0.930
   - pre-commit>=2.9.2
   - pycodestyle  # used by flake8
   - pyupgrade

pandas/compat/chainmap.py

@@ -1,8 +1,6 @@
 from typing import (
     ChainMap,
-    MutableMapping,
     TypeVar,
-    cast,
 )
 
 _KT = TypeVar("_KT")
@@ -18,11 +16,10 @@ class DeepChainMap(ChainMap[_KT, _VT]):
 
     def __setitem__(self, key: _KT, value: _VT) -> None:
         for mapping in self.maps:
-            mutable_mapping = cast(MutableMapping[_KT, _VT], mapping)
-            if key in mutable_mapping:
-                mutable_mapping[key] = value
+            if key in mapping:
+                mapping[key] = value
                 return
-        cast(MutableMapping[_KT, _VT], self.maps[0])[key] = value
+        self.maps[0][key] = value
 
     def __delitem__(self, key: _KT) -> None:
         """
@@ -32,8 +29,7 @@ def __delitem__(self, key: _KT) -> None:
             If `key` doesn't exist.
         """
         for mapping in self.maps:
-            mutable_mapping = cast(MutableMapping[_KT, _VT], mapping)
             if key in mapping:
-                del mutable_mapping[key]
+                del mapping[key]
                 return
         raise KeyError(key)

pandas/core/arrays/_mixins.py

@@ -138,13 +138,11 @@ def view(self, dtype: Dtype | None = None) -> ArrayLike:
 
             return TimedeltaArray(arr.view("i8"), dtype=dtype)
 
-        # error: Incompatible return value type (got "ndarray", expected
-        # "ExtensionArray")
         # error: Argument "dtype" to "view" of "_ArrayOrScalarCommon" has incompatible
         # type "Union[ExtensionDtype, dtype[Any]]"; expected "Union[dtype[Any], None,
         # type, _SupportsDType, str, Union[Tuple[Any, int], Tuple[Any, Union[int,
         # Sequence[int]]], List[Any], _DTypeDict, Tuple[Any, Any]]]"
-        return arr.view(dtype=dtype)  # type: ignore[return-value,arg-type]
+        return arr.view(dtype=dtype)  # type: ignore[arg-type]
 
     def take(
         self: NDArrayBackedExtensionArrayT,
@@ -276,13 +274,9 @@ def __getitem__(
                 return self._box_func(result)
             return self._from_backing_data(result)
 
-        # error: Value of type variable "AnyArrayLike" of "extract_array" cannot be
-        # "Union[int, slice, ndarray]"
         # error: Incompatible types in assignment (expression has type "ExtensionArray",
         # variable has type "Union[int, slice, ndarray]")
-        key = extract_array(  # type: ignore[type-var,assignment]
-            key, extract_numpy=True
-        )
+        key = extract_array(key, extract_numpy=True)  # type: ignore[assignment]
         key = check_array_indexer(self, key)
         result = self._ndarray[key]
         if lib.is_scalar(result):

pandas/core/arrays/string_.py

@@ -545,12 +545,10 @@ def _str_map(
                 mask.view("uint8"),
                 convert=False,
                 na_value=na_value,
-                # error: Value of type variable "_DTypeScalar" of "dtype" cannot be
-                # "object"
                 # error: Argument 1 to "dtype" has incompatible type
                 # "Union[ExtensionDtype, str, dtype[Any], Type[object]]"; expected
                 # "Type[object]"
-                dtype=np.dtype(dtype),  # type: ignore[type-var,arg-type]
+                dtype=np.dtype(dtype),  # type: ignore[arg-type]
             )
 
             if not na_value_is_na:

pandas/core/arrays/string_arrow.py

@@ -675,12 +675,10 @@ def _str_map(
                 mask.view("uint8"),
                 convert=False,
                 na_value=na_value,
-                # error: Value of type variable "_DTypeScalar" of "dtype" cannot be
-                # "object"
                 # error: Argument 1 to "dtype" has incompatible type
                 # "Union[ExtensionDtype, str, dtype[Any], Type[object]]"; expected
                 # "Type[object]"
-                dtype=np.dtype(dtype),  # type: ignore[type-var,arg-type]
+                dtype=np.dtype(dtype),  # type: ignore[arg-type]
             )
 
             if not na_value_is_na:

pandas/core/computation/scope.py

@@ -232,8 +232,7 @@ def swapkey(self, old_key: str, new_key: str, new_value=None) -> None:
 
         for mapping in maps:
             if old_key in mapping:
-                # error: Unsupported target for indexed assignment ("Mapping[Any, Any]")
-                mapping[new_key] = new_value  # type: ignore[index]
+                mapping[new_key] = new_value
                 return
 
     def _get_vars(self, stack, scopes: list[str]) -> None:

pandas/core/indexes/frozen.py

@@ -105,6 +105,6 @@ def __repr__(self) -> str:
         return f"{type(self).__name__}({str(self)})"
 
     __setitem__ = __setslice__ = _disabled  # type: ignore[assignment]
-    __delitem__ = __delslice__ = _disabled  # type: ignore[assignment]
-    pop = append = extend = _disabled  # type: ignore[assignment]
+    __delitem__ = __delslice__ = _disabled
+    pop = append = extend = _disabled
     remove = sort = insert = _disabled  # type: ignore[assignment]