Merge remote-tracking branch 'upstream/main' into docs-to-stubs

Author: zoldalma999

.circleci/config.yml

@@ -42,7 +42,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==2.21.3
+            pip3 install --user cibuildwheel==2.22.0
             PATH="$HOME/.local/bin:$PATH" cibuildwheel --output-dir wheelhouse
 
       - store_artifacts:

.github/workflows/build-debian-multiarch.yml

@@ -96,13 +96,11 @@ jobs:
         install: ${{ env.INSTALL_CMD }}
 
         # Build a wheel, install it for running unit tests.
-        # --no-build-isolation is passed so that preinstalled meson-python can be used
-        # (done for optimization reasons)
+        # pip does not know that ninja is installed, and tries to install it again.
+        # so pass --ignore-dep ninja explicitly
         run: |
-          echo "\nBuilding pygame wheel\n"
-          pip3 wheel . --no-build-isolation --wheel-dir /artifacts -vvv
-          echo "\nInstalling wheel\n"
-          pip3 install --no-index --pre --break-system-packages --find-links /artifacts pygame-ce
+          echo "\nBuilding and installing pygame wheel\n"
+          PIP_BREAK_SYSTEM_PACKAGES=1 python3 dev.py --ignore-dep ninja build --wheel /artifacts --lax
           echo "\nRunning tests\n"
           export SDL_VIDEODRIVER=dummy
           export SDL_AUDIODRIVER=disk

.github/workflows/build-macos.yml

@@ -64,7 +64,7 @@ jobs:
         if: steps.macdep-cache.outputs.cache-hit != 'true'
         run: |
           export MAC_ARCH="${{ matrix.macarch }}"
-          brew install coreutils pkg-config
+          brew install coreutils
           cd buildconfig/macdependencies
           bash ./build_mac_deps.sh
 
@@ -104,7 +104,6 @@ jobs:
 
       # Setup macOS dependencies
       CIBW_BEFORE_ALL: |
-        brew install pkg-config
         cd buildconfig/macdependencies
         cp -r ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} ${{ github.workspace }}/pygame_mac_deps
         bash ./install_mac_deps.sh
@@ -135,10 +134,10 @@ jobs:
       - name: Install uv for speed
         uses: yezz123/setup-uv@v4
         with:
-          uv-version: "0.4.10"
+          uv-version: "0.5.4"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v2.22.0
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/build-manylinux.yml

@@ -68,14 +68,14 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
+      uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
       with:
         images: ghcr.io/${{ github.repository }}_${{ matrix.arch }}
         tags: type=raw,value=${{ hashFiles('buildconfig/manylinux-build/**') }}
 
     - name: Build and push Docker image
       if: steps.inspect.outcome == 'failure'
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}
@@ -91,7 +91,7 @@ jobs:
         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 }}
 
-      uses: pypa/cibuildwheel@v2.21.3
+      uses: pypa/cibuildwheel@v2.22.0
 
     # We upload the generated files under github actions assets
     - name: Upload dist

.github/workflows/build-on-msys2.yml

@@ -68,16 +68,10 @@ jobs:
           # mingw-w64-${{ matrix.env }}-freetype
           # mingw-w64-${{ matrix.env }}-portmidi
 
-      - name: Install additional dependencies
-        run: |
-          pip3 install "sphinx-autoapi<=3.3.2"
-
-      - name: Building pygame wheel
-        run: |
-          pip3 wheel . --wheel-dir /artifacts -vvv --no-build-isolation
-
-      - name: Installing wheel
-        run: pip3 install --no-index --pre --find-links /artifacts pygame-ce
+      # pip does not know that ninja is installed, and tries to install it again.
+      # so pass --ignore-dep ninja explicitly
+      - name: Build and install pygame wheel
+        run: python3 dev.py --ignore-dep ninja build --wheel /artifacts --lax
 
       - name: Run tests
         env:

.github/workflows/build-sdl3.yml

@@ -56,7 +56,9 @@ jobs:
 
     - name: Install pygame deps (linux)
       if: matrix.os == 'ubuntu-24.04'
-      run: sudo apt-get install libfreetype6-dev libportmidi-dev python3-dev
+      run: |
+        sudo apt-get update --fix-missing
+        sudo apt-get install libfreetype6-dev libportmidi-dev python3-dev
 
     - name: Install pygame deps (mac)
       if: matrix.os == 'macos-14'
@@ -87,6 +89,11 @@ jobs:
     - name: Build with SDL3
       run: python3 dev.py build --sdl3
 
+    # eventually we need to run all tests, but for now test that importing pygame
+    # works
+    - name: Test import works
+      run: python3 -c 'import pygame'
+
     # - name: Run tests
     #   env:
     #     SDL_VIDEODRIVER: "dummy"

.github/workflows/build-windows.yml

@@ -59,10 +59,10 @@ jobs:
       - name: Install uv for speed
         uses: yezz123/setup-uv@v4
         with:
-          uv-version: "0.4.10"
+          uv-version: "0.5.4"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v2.22.0
 
       - uses: actions/upload-artifact@v4
         with:

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

@@ -61,7 +61,7 @@ jobs:
         run: echo "VER=${GITHUB_REF_NAME#'release/'}" >> $GITHUB_OUTPUT
 
       - name: Generate release attestation
-        uses: actions/attest-build-provenance@v1.4.3
+        uses: actions/attest-build-provenance@v1.4.4
         with:
           subject-path: "pygame-wheels/*"
 

README.rst

@@ -8,7 +8,7 @@
 |PyPiVersion| |PyPiLicense|
 |Python3| |GithubCommits| |BlackFormatBadge|
 
-**English** `简体中文`_ `繁體中文`_ `Français`_ `فارسی`_ `Español`_ `日本語`_ `Italiano`_
+**English** `简体中文`_ `繁體中文`_ `Français`_ `فارسی`_ `Español`_ `日本語`_ `Italiano`_ `Русский`_
 ---------------------------------------------------------------------------------------------------
 
 Pygame_ is a free and open-source cross-platform library
@@ -139,9 +139,9 @@ Dependency versions:
 
 
 +----------+------------------------+
-| CPython  | >= 3.8 (Or use PyPy3)  |
+| CPython  | >= 3.9 (Or use PyPy3)  |
 +----------+------------------------+
-| SDL      | >= 2.0.10              |
+| SDL      | >= 2.0.14              |
 +----------+------------------------+
 | SDL_mixer| >= 2.0.4               |
 +----------+------------------------+
@@ -221,3 +221,4 @@ See docs/licenses for licenses of dependencies.
 .. _Español: ./docs/readmes/README.es.rst
 .. _日本語: ./docs/readmes/README.ja.rst
 .. _Italiano: ./docs/readmes/README.it.rst
+.. _Русский: ./docs/readmes/README.ru.rst

buildconfig/manylinux-build/docker_base/Dockerfile-aarch64

@@ -1,5 +1,5 @@
 # pin version on image for CI stability
-FROM quay.io/pypa/manylinux2014_aarch64:2024.10.07-1
+FROM quay.io/pypa/manylinux2014_aarch64:2024.11.16-1
 ENV MAKEFLAGS="-j 2"
 ENV PG_DEP_PREFIX="/usr/local"