Merge remote-tracking branch 'upstream/main' into move-window-docs

.gitattributes

@@ -1,8 +1,6 @@
 # define files/directories that won't be exported in an sdist
 # Keep in sync with MANIFEST.in
-.circleci/ export-ignore
 .github/ export-ignore
-buildconfig/ci/ export-ignore
 buildconfig/macdependencies/ export-ignore
 buildconfig/manylinux-build/ export-ignore
 

.github/workflows/build-manylinux.yml

@@ -38,15 +38,15 @@ concurrency:
 jobs:
   build:
     name: ${{ matrix.arch }}
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     permissions:
       contents: read
       packages: write
 
     strategy:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
       matrix:
-        arch: [x86_64, i686]
+        arch: [x86_64, i686, aarch64]
 
     env:
       CIBW_ARCHS: ${{ matrix.arch }}
@@ -75,7 +75,7 @@ jobs:
 
     - name: Build and push Docker image
       if: steps.inspect.outcome == 'failure'
-      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
+      uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}
@@ -90,6 +90,8 @@ jobs:
         CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ghcr.io/${{ github.repository }}_x86_64:${{ steps.meta.outputs.version }}
         CIBW_MANYLINUX_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
         CIBW_MANYLINUX_PYPY_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
+        CIBW_MANYLINUX_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
+        CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
 
       uses: pypa/[email protected]
 

.github/workflows/release-gh-draft.yml

@@ -5,18 +5,6 @@ on:
     branches: 'release/**'
 
 jobs:
-  manylinux-aarch64:
-    runs-on: ubuntu-latest
-    outputs:
-      pipeline_id: ${{ steps.circleci.outputs.id }}
-
-    steps:
-      - name: Trigger CircleCI builds on release
-        id: circleci
-        uses: CircleCI-Public/[email protected]
-        env:
-          CCI_TOKEN: ${{ secrets.CCI_TOKEN }}
-
   manylinux:
     uses: ./.github/workflows/build-manylinux.yml
 
@@ -46,14 +34,6 @@ jobs:
           path: pygame-wheels
           merge-multiple: true
 
-      - name: Download manylinux-aarch64 artifacts from CircleCI
-        continue-on-error: true # incase things don't work here, can manually handle it
-        run: >
-          python3 buildconfig/ci/circleci/pull_circleci_artifacts.py
-          ${{ secrets.CCI_TOKEN }}
-          ${{ needs.manylinux-aarch64.outputs.pipeline_id }}
-          pygame-wheels
-
       # Strips 'release/' from the ref_name, this helps us access the version
       # name as 'steps.ver.outputs.VER'
       - name: Get version

buildconfig/MANIFEST.in

@@ -5,7 +5,6 @@ recursive-include src_c *
 recursive-include examples *
 recursive-include test *
 
-recursive-exclude buildconfig/ci *
 recursive-exclude buildconfig/manylinux-build *
 recursive-exclude buildconfig/macdependencies *
 recursive-exclude buildconfig/stubs/.mypy_cache *

buildconfig/download_win_prebuilt.py

@@ -82,16 +82,16 @@ def get_urls(x86=True, x64=True):
         '163e3300a1450e6e7d4fff0d35b039c3eae44e79',
         ],
         [
-        'https://github.com/libsdl-org/SDL/releases/download/preview-3.1.8/SDL3-devel-3.1.8-VC.zip',
-        '6b17cd6414d8f42b43a6006ddb2b40fd4c3b7c7b'
+        'https://github.com/libsdl-org/SDL/releases/download/release-3.2.0/SDL3-devel-3.2.0-VC.zip',
+        'd382072cd045d74a802541bf8d0b13e21ffed740'
         ],
         [
         'https://github.com/pygame-community/SDL_image/releases/download/2.8.4-pgce/SDL2_image-devel-2.8.4-VCpgce.zip',
         'b9b4a5d44cab57901003255a1c1f98a42282762b'
         ],
         [
-        'https://github.com/libsdl-org/SDL_image/releases/download/preview-3.1.0/SDL3_image-devel-3.1.0-VC.zip',
-        '8538fea0cc4aabba2fc64db06196f1bb76a2785f'
+        'https://github.com/libsdl-org/SDL_image/releases/download/prerelease-3.1.1/SDL3_image-devel-3.1.1-VC.zip',
+        '01f751322e742bb9dd3121d5ef37214c0529cb7c'
         ],
         [
         'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-devel-2.24.0-VC.zip',
@@ -220,12 +220,12 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3_image-devel-3.1.0-VC/SDL3_image-3.1.0'
+                'SDL3_image-devel-3.1.1-VC/SDL3_image-3.1.1'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3_image-3.1.0'
+                'SDL3_image-3.1.1'
             )
         )
 
@@ -265,12 +265,12 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3-devel-3.1.8-VC/SDL3-3.1.8'
+                'SDL3-devel-3.2.0-VC/SDL3-3.2.0'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3-3.1.8'
+                'SDL3-3.2.0'
             )
         )
 

buildconfig/stubs/pygame/_sdl2/controller.pyi

@@ -23,9 +23,9 @@ class Controller:
     def as_joystick(self) -> JoystickType: ...
     def get_axis(self, axis: int) -> int: ...
     def get_button(self, button: int) -> bool: ...
-    def get_mapping(self) -> dict: ...
-    def set_mapping(self, mapping: dict) -> int: ...
-    def rumble(self, ___) -> bool: ...
-    def stop_rumble(
+    def get_mapping(self) -> dict[str, str]: ...
+    def set_mapping(self, mapping: dict[str, str]) -> int: ...
+    def rumble(
         self, low_frequency: float, high_frequency: float, duration: int
     ) -> bool: ...
+    def stop_rumble(self) -> None: ...

buildconfig/stubs/pygame/_sdl2/touch.pyi

@@ -1,6 +1,6 @@
-from typing import Union
+from typing import Union, Optional
 
 def get_num_devices() -> int: ...
-def get_device(index: int) -> int: ...
-def get_num_fingers(device_id: int) -> int: ...
-def get_finger(touchid: int, index: int) -> dict[str, Union[int, float]]: ...
+def get_device(index: int, /) -> int: ...
+def get_num_fingers(device_id: int, /) -> int: ...
+def get_finger(touchid: int, index: int) -> Optional[dict[str, Union[int, float]]]: ...

buildconfig/stubs/pygame/window.pyi

@@ -94,7 +94,24 @@ class Window:
         title: str = "pygame window",
         size: Point = (640, 480),
         position: Union[int, Point] = WINDOWPOS_UNDEFINED,
-        **flags: bool,
+        *,
+        fullscreen: bool = ...,
+        fullscreen_desktop: bool = ...,
+        opengl: bool = ...,
+        vulkan: bool = ...,
+        hidden: bool = ...,
+        borderless: bool = ...,
+        resizable: bool = ...,
+        minimized: bool = ...,
+        maximized: bool = ...,
+        mouse_grabbed: bool = ...,
+        keyboard_grabbed: bool = ...,
+        input_focus: bool = ...,
+        mouse_focus: bool = ...,
+        allow_high_dpi: bool = ...,
+        mouse_capture: bool = ...,
+        always_on_top: bool = ...,
+        utility: bool = ...,
     ) -> None: ...
 
     grab_mouse: bool