Update type hints for NumPy 1.22.4.

Fix broken assert in Renderer.read_pixels.

Show error codes by default in MyPy.

Author: HexDecimal

examples/samples_tcod.py

@@ -140,7 +140,7 @@ def interpolate_corner_colors(self) -> None:
     def darken_background_characters(self) -> None:
         # darken background characters
         sample_console.fg[:] = sample_console.bg[:]
-        sample_console.fg[:] //= 2
+        sample_console.fg[:] //= 2  # type: ignore[arg-type]  # https://github.com/numpy/numpy/issues/21592
 
     def randomize_sample_conole(self) -> None:
         # randomize sample console characters

setup.cfg

@@ -15,6 +15,7 @@ max-line-length = 130
 [mypy]
 python_version = 3.8
 warn_unused_configs = True
+show_error_codes = True
 disallow_subclassing_any = True
 disallow_any_generics = True
 disallow_untyped_calls = True

tcod/console.py

@@ -243,7 +243,7 @@ def ch(self) -> NDArray[np.intc]:
         Index this array with ``console.ch[i, j]  # order='C'`` or
         ``console.ch[x, y]  # order='F'``.
         """
-        return self._tiles["ch"].T if self._order == "F" else self._tiles["ch"]  # type: ignore
+        return self._tiles["ch"].T if self._order == "F" else self._tiles["ch"]
 
     @property  # type: ignore
     @deprecate("This attribute has been renamed to `rgba`.")

tcod/path.py

@@ -344,7 +344,7 @@ def _compile_cost_edges(edge_map: Any) -> Tuple[Any, int]:
     edge_array = np.transpose(edge_nz)
     edge_array -= edge_center
     c_edges = ffi.new("int[]", len(edge_array) * 3)
-    edges = np.frombuffer(ffi.buffer(c_edges), dtype=np.intc).reshape(len(edge_array), 3)  # type: ignore
+    edges = np.frombuffer(ffi.buffer(c_edges), dtype=np.intc).reshape(len(edge_array), 3)
     edges[:, :2] = edge_array
     edges[:, 2] = edge_map[edge_nz]
     return c_edges, len(edge_array)
@@ -1148,7 +1148,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]  # type: ignore
+            return self._travel.transpose((*axes[-2::-1], axes[-1]))[..., ::-1]
         return self._travel
 
     def clear(self) -> None:
@@ -1320,7 +1320,7 @@ def path_from(self, index: Tuple[int, ...]) -> NDArray[Any]:
                 ffi.from_buffer("int*", path),
             )
         )
-        return path[:, ::-1] if self._order == "F" else path  # type: ignore
+        return path[:, ::-1] if self._order == "F" else path
 
     def path_to(self, index: Tuple[int, ...]) -> NDArray[Any]:
         """Return the shortest path from the nearest root to `index`.
@@ -1347,4 +1347,4 @@ def path_to(self, index: Tuple[int, ...]) -> NDArray[Any]:
             >>> pf.path_to((0, 0))[1:].tolist()  # Exclude the starting point so that a blocked path is an empty list.
             []
         """  # noqa: E501
-        return self.path_from(index)[::-1]  # type: ignore
+        return self.path_from(index)[::-1]

tcod/sdl/render.py

@@ -508,7 +508,7 @@ def read_pixels(
                 out = np.empty((height, width, 3), dtype=np.uint8)
             else:
                 raise TypeError("Pixel format not supported yet.")
-        assert out.shape[:2] == height, width
+        assert out.shape[:2] == (height, width)
         assert out[0].flags.c_contiguous
         _check(lib.SDL_RenderReadPixels(self.p, format, ffi.cast("void*", out.ctypes.data), out.strides[0]))
         return out

tcod/tileset.py

@@ -428,7 +428,7 @@ def procedural_block_elements(*, tileset: Tileset) -> None:
         (0x259F, 0b0111),  # "▟" Quadrant upper right and lower left and lower right.
     ):
         alpha: NDArray[np.uint8] = np.asarray((quadrants & quad_mask) != 0, dtype=np.uint8)
-        alpha *= 255
+        alpha *= 255  # type: ignore[arg-type]  # https://github.com/numpy/numpy/issues/21592
         tileset.set_tile(codepoint, alpha)
 
     for codepoint, axis, fraction, negative in (