Merge branch 'main' into clean-surface-docs-3

Author: damusss

.github/workflows/build-ubuntu-sdist.yml

@@ -50,7 +50,7 @@ jobs:
         sudo apt-get update --fix-missing
         sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev python3-dev
         pip3 install --upgrade pip
-        pip3 install build numpy>=1.21.0
+        pip3 install build numpy
 
     - name: Make sdist and install it
       run: |
@@ -62,11 +62,10 @@ jobs:
         SDL_VIDEODRIVER: "dummy"
         SDL_AUDIODRIVER: "disk"
       run: python3 -m pygame.tests -v --exclude opengl,music,timing --time_out 300
+      working-directory: ${{ github.workspace }}/..
 
     - name: Test typestubs
-      run: |
-        pip3 install mypy==1.13.0
-        python3 buildconfig/stubs/stubcheck.py
+      run: python3 dev.py stubs
 
     # We upload the generated files under github actions assets
     - name: Upload sdist

.pre-commit-config.yaml

@@ -6,7 +6,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
     - id: end-of-file-fixer
       exclude: |
@@ -26,7 +26,7 @@ repos:
           )$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.12
+    rev: v0.14.0
     hooks:  # See pyproject.toml for configuration options.
       - id: ruff
         name: ruff-sort-imports
@@ -35,7 +35,7 @@ repos:
         types_or: [ python, pyi, jupyter ]
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v20.1.5
+    rev: v21.1.2
     hooks:
       - id: clang-format
         exclude: |

buildconfig/stubs/gen_stubs.py

@@ -94,6 +94,11 @@ def get_all(mod: Any):
     return [i for i in dir(mod) if not i.startswith("_")]
 
 
+def fmt_list(seq: list[str]):
+    inner = "\n".join(f'    "{i}",' for i in seq)
+    return f"[\n{inner}\n]\n"
+
+
 # store all imports of __init__.pyi
 pygame_all_imports = {"pygame": PG_AUTOIMPORT_SUBMODS}
 for k, v in PG_AUTOIMPORT_CLASSES.items():
@@ -121,6 +126,8 @@ def get_all(mod: Any):
         constant_type = getattr(pygame.constants, element).__class__.__name__
         f.write(f"{element}: {constant_type}\n")
 
+    f.write("__all__ = " + fmt_list(pygame.constants.__all__))
+
 
 # write __init__.pyi file
 init_file = pathlib.Path(__file__).parent / "pygame" / "__init__.pyi"
@@ -157,6 +164,8 @@ def get_all(mod: Any):
         constant_type = getattr(pygame.locals, element).__class__.__name__
         f.write(f"{element}: {constant_type}\n")
 
+    f.write("__all__ = " + fmt_list(pygame.locals.__all__))
+
 # copy typing.py to typing.pyi for type checkers
 typing_py_file = pathlib.Path(__file__).parent.parent.parent / "src_py" / "typing.py"
 typing_stub_file = pathlib.Path(__file__).parent / "pygame" / "typing.pyi"

buildconfig/stubs/pygame/bufferproxy.pyi

@@ -17,7 +17,9 @@ class BufferProxy:
     if sys.version_info >= (3, 12):
         def __buffer__(self, flags: int, /) -> memoryview[int]: ...
         def __release_buffer__(self, view: memoryview[int], /) -> None: ...
-    def __init__(self, parent: Any) -> None: ...  # TODO: parent: TypedDict | Protocol
+    def __new__(
+        cls, parent: Any
+    ) -> BufferProxy: ...  # TODO: parent: TypedDict | Protocol
     def write(
         self,
         buffer: str | bytes,  # Any "read-only bytes-like-object" is valid