Update type ignores for newest Numpy

Author: HexDecimal

examples/samples_tcod.py

@@ -1208,7 +1208,7 @@ def on_draw(self) -> None:
             # new pixels are based on absolute elapsed time
             int_abs_t = int(self.abs_t)
 
-            texture = np.roll(texture, -int_t, 1)  # type: ignore[assignment]
+            texture = np.roll(texture, -int_t, 1)
             # replace new stretch of texture with new values
             for v in range(RES_V - int_t, RES_V):
                 for u in range(RES_U):

tcod/path.py

@@ -115,7 +115,7 @@ def __init__(
         super().__init__(callback, shape)
 
 
-class NodeCostArray(np.ndarray):  # type: ignore[type-arg]
+class NodeCostArray(np.ndarray):
     """Calculate cost from a numpy array of nodes.
 
     `array` is a NumPy array holding the path-cost of each node.
@@ -596,7 +596,7 @@ def _world_array(shape: tuple[int, ...], dtype: DTypeLike = np.int32) -> NDArray
     )
 
 
-def _as_hashable(obj: np.ndarray[Any, Any] | None) -> object | None:
+def _as_hashable(obj: NDArray[Any] | None) -> object | None:
     """Return NumPy arrays as a more hashable form."""
     if obj is None:
         return obj
@@ -772,7 +772,7 @@ def add_edge(
             cost = cost.T
             if condition is not None:
                 condition = condition.T
-        key = (_as_hashable(cost), _as_hashable(condition))
+        key = (_as_hashable(cost), _as_hashable(condition))  # type: ignore[arg-type]
         try:
             rule = self._graph[key]
         except KeyError:
@@ -789,7 +789,7 @@ def add_edge(
     def add_edges(
         self,
         *,
-        edge_map: ArrayLike,
+        edge_map: ArrayLike | NDArray[np.integer],
         cost: NDArray[Any],
         condition: ArrayLike | None = None,
     ) -> None:
@@ -894,16 +894,20 @@ def add_edges(
             # edge_map needs to be converted into C.
             # The other parameters are converted by the add_edge method.
             edge_map = edge_map.T
-        edge_center = tuple(i // 2 for i in edge_map.shape)
-        edge_map[edge_center] = 0
-        edge_map[edge_map < 0] = 0
-        edge_nz = edge_map.nonzero()
-        edge_costs = edge_map[edge_nz]
+        edge_center = tuple(i // 2 for i in edge_map.shape)  # type: ignore[union-attr]
+        edge_map[edge_center] = 0  # type: ignore[index]
+        edge_map[edge_map < 0] = 0  # type: ignore[index, operator]
+        edge_nz = edge_map.nonzero()  # type: ignore[union-attr]
+        edge_costs = edge_map[edge_nz]  # type: ignore[index]
         edge_array = np.transpose(edge_nz)
         edge_array -= edge_center
-        for edge, edge_cost in zip(edge_array, edge_costs, strict=True):
+        for edge, edge_cost in zip(
+            edge_array,
+            edge_costs,  # type: ignore[arg-type]
+            strict=True,
+        ):
             self.add_edge(
-                tuple(edge.tolist()),  # type: ignore[arg-type]
+                tuple(edge.tolist()),
                 edge_cost,
                 cost=cost,
                 condition=condition,
@@ -1170,7 +1174,7 @@ def traversal(self) -> NDArray[Any]:
         """
         if self._order == "F":
             axes = range(self._travel.ndim)
-            return self._travel.transpose((*axes[-2::-1], axes[-1]))[..., ::-1]
+            return self._travel.transpose((*axes[-2::-1], axes[-1]))[..., ::-1]  # type: ignore[no-any-return]
         return self._travel
 
     def clear(self) -> None:

tcod/sdl/audio.py

@@ -188,7 +188,7 @@ def convert_audio(
                 out_length,
             )
         )
-        return (
+        return (  # type: ignore[no-any-return]
             np.frombuffer(ffi.buffer(out_buffer[0], out_length[0]), dtype=out_format).reshape(-1, out_channels).copy()
         )
     except RuntimeError as exc: