Merge pull request #496 from numpy/bump-dev-deps

Author: jorenham

lefthook.yml

@@ -13,6 +13,8 @@ pre-commit:
       glob: "*.{py,pyi}"
       run: uv run --no-sync tool/format_ignores.py {staged_files}
       stage_fixed: true
+      exclude:
+        - "tool/test/test_format_ignores.py"
     docs-check:
       glob:
         - "docs/**"

pyproject.toml

@@ -50,11 +50,11 @@ dependencies = []
 
 [dependency-groups]
 numpy = ["numtype[numpy]"]
-lint = ["ruff>=0.11.4"]
+lint = ["ruff>=0.11.5"]
 pytest = [
     {include-group = "numpy"},
     "pytest>=8.3.5",
-    "typing_extensions>=4.13.1",
+    "typing_extensions>=4.13.2",
 ]
 list_and_test = [
     {include-group = "lint"},
@@ -68,7 +68,7 @@ types = [
 basedpyright = [
     {include-group = "numpy"},
     {include-group = "types"},
-    "basedpyright>=1.28.4",
+    "basedpyright>=1.28.5",
 ]
 mypy = [
     {include-group = "types"},

src/_numtype/@test/test_to_array.pyi

@@ -1,4 +1,3 @@
-# ruff: noqa: PYI042, UP018
 from typing import TypeAlias
 from typing_extensions import TypeVar
 

src/numpy-stubs/__init__.pyi

@@ -8147,7 +8147,7 @@ class float64(floating[_n._64], float):  # type: ignore[misc]
     @overload
     def __rfloordiv__(self, x: _CoFloat64, /) -> Self: ...
     @overload
-    def __rfloordiv__(self, x: _JustFloating | _nt.Just[inexact], /) -> floating: ...  # pyright: ignore[reportIncompatibleMethodOverride]
+    def __rfloordiv__(self, x: _JustFloating | _nt.Just[inexact], /) -> floating: ...
 
     # keep in sync with `__truediv__` (minus the complex overloads)
     @overload
@@ -8159,7 +8159,7 @@ class float64(floating[_n._64], float):  # type: ignore[misc]
     @overload
     def __rmod__(self, x: _CoFloat64, /) -> Self: ...
     @overload
-    def __rmod__(self, x: _JustFloating | _nt.Just[inexact], /) -> floating: ...  # pyright: ignore[reportIncompatibleMethodOverride]
+    def __rmod__(self, x: _JustFloating | _nt.Just[inexact], /) -> floating: ...
 
     # keep in sync with `__truediv__` (minus the complex overloads)
     @overload

src/numpy-stubs/ma/core.pyi

@@ -313,7 +313,7 @@ class MaskedArray(np.ndarray[_ShapeT_co, _DTypeT_co]):
     @override
     def shape(self) -> _ShapeT_co: ...
     @shape.setter
-    def shape(self: MaskedArray[_ShapeT], shape: _ShapeT, /) -> None: ...  # pyright: ignore[reportIncompatibleMethodOverride]
+    def shape(self: MaskedArray[_ShapeT], shape: _ShapeT, /) -> None: ...
 
     #
     @property

src/numpy-stubs/matrixlib/defmatrix.pyi

@@ -231,7 +231,7 @@ class matrix(np.ndarray[_ShapeT_co, _DTypeT_co]):
     #
     @property
     @override
-    def T(self) -> matrix[_2D, _DTypeT_co]: ...  # type: ignore[override]  # pyright: ignore[reportIncompatibleMethodOverride]
+    def T(self) -> matrix[_2D, _DTypeT_co]: ...  # type: ignore[override]
     def getT(self) -> matrix[_2D, _DTypeT_co]: ...
 
     #

src/numpy-stubs/random/bit_generator.pyi

@@ -93,7 +93,7 @@ class ISeedSequence(abc.ABC):
 
 class ISpawnableSeedSequence(ISeedSequence, abc.ABC):
     @abc.abstractmethod
-    def spawn(self, /, n_children: int) -> list[Self]: ...
+    def spawn(self, /, n_children: int) -> Sequence[Self]: ...
 
 class SeedlessSeedSequence(_GenerateStateMixin, ISpawnableSeedSequence):
     @override

src/numpy-stubs/testing/_private/utils.pyi

@@ -129,7 +129,7 @@ class KnownFailureException(Exception): ...
 class IgnoreException(Exception): ...
 
 # NOTE: `warnings.catch_warnings` is incorrectly defined as invariant in typeshed
-class clear_and_catch_warnings(warnings.catch_warnings[_W_co], Generic[_W_co]):  # type: ignore[type-var]  # pyright: ignore[reportInvalidTypeArguments]
+class clear_and_catch_warnings(warnings.catch_warnings[_W_co], Generic[_W_co]):  # type: ignore[type-var]
     class_modules: ClassVar[tuple[types.ModuleType, ...]] = ()
     modules: Final[set[types.ModuleType]]
 

tool/stubtest.py.lock

@@ -1,6 +1,5 @@
 """Test the format_ignores module."""
 
-# ruff: noqa: PLC2701
 import errno
 import sys
 from pathlib import Path
@@ -14,6 +13,16 @@
     main,
 )
 
+_TEST_SOURCE_TEMPLATE = """
+def func1() -> None:
+    # {}
+    pass
+
+def func2() -> None:
+    # {}
+    pass
+""".lstrip()
+
 
 @pytest.mark.parametrize(
     ("input_text", "expected_output"),
@@ -35,15 +44,16 @@ def test_sort_ignore_list(input_text: str, expected_output: str) -> None:
 
 def test_process_file(tmpdir: pytest.TempdirFactory) -> None:
     """Test _process_file function."""
-    test_file = Path(str(tmpdir)) / "test.pyi"
-    test_content = """def func1() -> None:
-    # type: ignore[attr-defined, no-any-return]
-    pass
+    test_content = _TEST_SOURCE_TEMPLATE.format(
+        "type:  ignore[attr-defined, no-any-return]",
+        "pyright: ignore[reportUnknownMemberType,reportUnknownVariableType]",
+    )
+    expected_content = _TEST_SOURCE_TEMPLATE.format(
+        "type: ignore[attr-defined, no-any-return]",
+        "pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]",
+    )
 
-    def func2() -> None:
-        # pyright: ignore[reportUnknownMemberType,reportUnknownVariableType]
-        pass
-    """
+    test_file = Path(str(tmpdir)) / "test.pyi"
     test_file.write_text(test_content, encoding="utf-8")
 
     # Check-only mode
@@ -54,15 +64,6 @@ def func2() -> None:
     # Processing mode
     modified = _process_file(test_file)
     assert modified is True
-
-    expected_content = """def func1() -> None:
-    # type: ignore[attr-defined, no-any-return]
-    pass
-
-    def func2() -> None:
-        # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]
-        pass
-    """
     assert test_file.read_text(encoding="utf-8") == expected_content
 
     # Re-processing
@@ -95,7 +96,7 @@ def test_process_directory(tmpdir: pytest.TempdirFactory) -> None:
         encoding="utf-8",
     )
     test_files[2].write_text(
-        "# pyright: ignore[reportUnknownVariableType,reportUnknownMemberType]",
+        "# " + "pyright: ignore[reportUnknownVariableType,reportUnknownMemberType]",
         encoding="utf-8",
     )
     test_files[3].write_text(
@@ -134,7 +135,7 @@ def test_process_directory(tmpdir: pytest.TempdirFactory) -> None:
     )
     assert (
         test_files[2].read_text(encoding="utf-8")
-        == "# pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]"
+        == "# " + "pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]"
     )
     assert (
         test_files[3].read_text(encoding="utf-8")
@@ -206,7 +207,10 @@ def test_main_custom_pattern(
     """Test main function with custom pattern."""
     temp_dir = Path(str(tmpdir))
     test_py = temp_dir / "test.py"
-    test_py.write_text("# type: ignore[no-any-return, attr-defined]", encoding="utf-8")
+    test_py.write_text(
+        "# type: ignore[attr-defined, no-any-return]",
+        encoding="utf-8",
+    )
 
     monkeypatch.setattr(
         sys,