Merge branch 'main' of https://github.com/pygame-community/pygame-ce into window-create-context

Author: oddbookworm

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
 
     environment:
       # these environment variables will be passed to the docker container
-      - CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini PORTMIDI_INC_PORTTIME=1 SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
+      - CIBW_ENVIRONMENT: SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
       - CIBW_BUILD: "cp3{8,9,10,11,12}-* pp3{8,9,10}-*"
       - CIBW_ARCHS: aarch64
       - CIBW_SKIP: '*-musllinux_*'
@@ -48,7 +48,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==2.16.2
+            pip3 install --user cibuildwheel==2.16.4
             PATH="$HOME/.local/bin:$PATH" cibuildwheel --output-dir wheelhouse
 
       - store_artifacts:

src_py/.editorconfig renamed to .editorconfig

@@ -4,19 +4,18 @@ root=true
 end_of_line = lf
 insert_final_newline = true
 
-# The settings for C (*.c and *.h) files are mirrored in src_c/.clang-format.
-# Keep them in sync.
-[*.{c,h}]
+[*.{c,h,py,pyx,pyi}]
 indent_style = space
 indent_size = 4
 tab_width = 4
+charset = utf-8
 trim_trailing_whitespace = true
+
+# The settings for C (*.c and *.h) files are mirrored in src_c/.clang-format.
+# Keep them in sync.
+[*.{c,h}]
 max_line_length = 79
 
-[*.{py,pyx}]
-indent_style = space
-indent_size = 4
-charset = utf-8
+[*.{py,pyx,pyi}]
 file_type_emacs = python
-trim_trailing_whitespace = true
-max_line_length = 79
+max_line_length = 88

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

@@ -35,26 +35,45 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-debian-multiarch
   cancel-in-progress: true
 
+# this command is called in two places, so save it in an env first
+env:
+  INSTALL_CMD: |
+    apt-get update --fix-missing
+    apt-get upgrade -y
+    apt-get install build-essential meson -y
+    apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev -y
+    apt-get install libfreetype6-dev libportmidi-dev fontconfig -y
+    apt-get install python3-dev python3-pip python3-wheel python3-sphinx -y
+    pip3 install meson-python --break-system-packages
+
 jobs:
   build-multiarch:
-    name: Debian (Bullseye - 11) [${{ matrix.arch }}]
+    name: Debian (Bookworm - 12) [${{ matrix.arch }}]
     runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
       matrix:
         # maybe more things could be added in here in the future (if needed)
-        arch: [s390x, ppc64le]
+        include:
+          - { arch: s390x, base_image: '' }
+          - { arch: ppc64le, base_image: '' }
+          - { arch: armv6, base_image: '' }
+          # a custom base_image is specified in the armv7 case. This is done because
+          # the armv6 image is just raspbian in disguise. And the wheel built on armv7
+          # is going to be tested on armv6
+          - { arch: armv7, base_image: 'balenalib/raspberrypi3-debian:bookworm' }
 
     steps:
-    - uses: actions/[email protected].1
+    - uses: actions/[email protected].2
 
     - name: Build sources and run tests
-      uses: uraimo/run-on-arch-action@v2.6.0
+      uses: uraimo/run-on-arch-action@v2.7.2
       id: build
       with:
-        arch: ${{ matrix.arch }}
-        distro: bullseye
+        arch: ${{ matrix.base_image && 'none' || matrix.arch }}
+        distro: ${{ matrix.base_image && 'none' || 'bookworm' }}
+        base_image: ${{ matrix.base_image }}
 
         # Not required, but speeds up builds
         githubToken: ${{ github.token }}
@@ -74,20 +93,61 @@ jobs:
         # builds don't have to re-install them. The image layer is cached
         # publicly in your project's package repository, so it is vital that
         # no secrets are present in the container state or logs.
-        install: |
-          apt-get update --fix-missing
-          apt-get upgrade -y
-          apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev fontconfig -y
-          apt-get install python3-setuptools python3-dev python3-pip python3-wheel python3-sphinx -y
+        install: ${{ env.INSTALL_CMD }}
 
-        # Build a wheel, install it for running unit tests
+        # 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)
         run: |
-          export PIP_CONFIG_FILE=buildconfig/pip_config.ini
           echo "\nBuilding pygame wheel\n"
           python3 setup.py docs
-          pip3 wheel . --wheel-dir /artifacts -vvv
+          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 "\nRunning tests\n"
+          export SDL_VIDEODRIVER=dummy
+          export SDL_AUDIODRIVER=disk
+          python3 -m pygame.tests -v --exclude opengl,music,timing --time_out 300
+    
+    # Upload the generated files under github actions assets section
+    - name: Upload dist
+      uses: actions/upload-artifact@v4
+      with:
+        name: pygame-multiarch-${{ matrix.arch }}-dist
+        path: ~/artifacts/*.whl
+
+  # test wheels built on armv7 on armv6. Why?
+  # because piwheels expects the same armv7 wheel to work on both armv7 and armv6
+  test-armv7-on-armv6:
+    needs: build-multiarch
+    name: Debian (Bookworm - 12) [build - armv7, test - armv6]
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Download all multiarch artifacts
+      uses: actions/download-artifact@v4
+      with:
+        name: pygame-multiarch-armv7-dist
+        path: ~/artifacts
+
+    - name: Rename arm wheel in artifacts
+      run: |
+        cd ~/artifacts
+        for f in *; do
+          mv "$f" "${f//armv7l/armv6l}"
+        done
+
+    - name: Test armv7 wheel on armv6
+      uses: uraimo/[email protected]
+      with:
+        arch: armv6
+        distro: bookworm
+        githubToken: ${{ github.token }}
+        dockerRunArgs: --volume ~/artifacts:/artifacts_new
+        shell: /bin/sh
+        install: ${{ env.INSTALL_CMD }}
+        run: |
           echo "\nInstalling wheel\n"
-          pip3 install --no-index --pre --find-links /artifacts pygame-ce
+          pip3 install --no-index --pre --break-system-packages --find-links /artifacts_new pygame-ce
           echo "\nRunning tests\n"
           export SDL_VIDEODRIVER=dummy
           export SDL_AUDIODRIVER=disk

.github/workflows/build-emsdk.yml

@@ -47,11 +47,11 @@ jobs:
       WHEELHOUSE_CYTHON: /tmp/wheelhouse/cython
 
     steps:
-    - uses: actions/[email protected].1
+    - uses: actions/[email protected].2
 
     - name: Cache Cython
       id: cache-cython
-      uses: actions/cache@v3.3.3
+      uses: actions/cache@v4.0.2
       with:
         path: ${{ env.WHEELHOUSE_CYTHON }}
         key: wasm-ubuntu-cython-${{ env.LATEST_CYTHON_COMMIT }}-path-${{ env.WHEELHOUSE_CYTHON }}

.github/workflows/build-macos.yml

@@ -45,11 +45,11 @@ jobs:
         macarch: [arm64, x86_64]
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
 
       - name: Test for Mac Deps cache hit
         id: macdep-cache
-        uses: actions/cache@v3.3.3
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           # The hash of all files in buildconfig manylinux-build and macdependencies is 
@@ -120,7 +120,7 @@ jobs:
       # load pip config from this file. Define this in 'CIBW_ENVIRONMENT'
       # because this should not affect cibuildwheel machinery
       # also define environment variables needed for testing
-      CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
+      CIBW_ENVIRONMENT: SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
 
       # Explicitly tell CIBW what the wheel arch deployment target should be
       # There seems to be no better way to set this than this env
@@ -147,7 +147,7 @@ jobs:
         bash ./install_mac_deps.sh
 
       CIBW_BEFORE_BUILD: |
-        pip install requests numpy Sphinx"<7.2.0"
+        pip install numpy Sphinx"<7.2.0"
         python setup.py docs
         cp -r ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} ${{ github.workspace }}/pygame_mac_deps
 
@@ -160,24 +160,24 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
 
       - name: pip cache
-        uses: actions/cache@v3.3.3
+        uses: actions/cache@v4.0.2
         with:
           path: ~/Library/Caches/pip  # This cache path is only right on mac
           key: pip-cache-${{ matrix.name }}
 
       - name: Fetch Mac deps
         id: macdep-cache
-        uses: actions/cache@v3.3.3
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
           fail-on-cache-miss: true
 
       - name: Build and test wheels
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].4
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/build-manylinux.yml

@@ -52,7 +52,7 @@ jobs:
       # load pip config from this file. Define this in 'CIBW_ENVIRONMENT'
       # because this should not affect cibuildwheel machinery
       # also define environment variables needed for testing
-      CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini PORTMIDI_INC_PORTTIME=1 SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
+      CIBW_ENVIRONMENT: SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
 
       CIBW_BUILD: "cp3{8,9,10,11,12}-* pp3{8,9,10}-*"
       CIBW_ARCHS: ${{ matrix.arch }}
@@ -79,10 +79,10 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-    - uses: actions/[email protected].1
+    - uses: actions/[email protected].2
 
     - name: Log in to the Container registry
-      uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
+      uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
@@ -95,14 +95,14 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
+      uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
       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@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
+      uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}
@@ -118,7 +118,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/[email protected].2
+      uses: pypa/[email protected].4
 
     # We upload the generated files under github actions assets
     - name: Upload dist

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

@@ -0,0 +1,84 @@
+# Tests that pygame can compile on MSYS2
+name: MSYS2
+
+# Run CI only on changes to main branch, or any PR to main. Do not run CI on
+# any other branch. Also, skip any non-source changes from running on CI
+on:
+  push:
+    branches: main
+    paths-ignore:
+      - 'docs/**'
+      - 'examples/**'
+      - '.gitignore'
+      - '*.rst'
+      - '*.md'
+      - '.github/workflows/*.yml'
+      # re-include current file to not be excluded
+      - '!.github/workflows/build-on-msys2.yml'
+
+  pull_request:
+    branches: main
+    paths-ignore:
+      - 'docs/**'
+      - 'examples/**'
+      - '.gitignore'
+      - '*.rst'
+      - '*.md'
+      - '.github/workflows/*.yml'
+      # re-include current file to not be excluded
+      - '!.github/workflows/build-on-msys2.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-msys2
+  cancel-in-progress: true
+
+jobs:
+  msys2:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    strategy:
+      matrix:
+        include:
+          - { sys: mingw64, env: x86_64 }
+          - { sys: mingw32, env: i686 }
+          - { sys: ucrt64,  env: ucrt-x86_64 }
+          - { sys: clang32, env: clang-i686 }
+          - { sys: clang64, env: clang-x86_64 }
+          # - { sys: clangarm64, env: clang-aarch64 }
+
+    steps:
+      - uses: actions/[email protected]
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.sys }}
+          update: true
+          install: >-
+            mingw-w64-${{ matrix.env }}-gcc
+            mingw-w64-${{ matrix.env }}-pkg-config
+            mingw-w64-${{ matrix.env }}-python
+            mingw-w64-${{ matrix.env }}-python-pip
+            mingw-w64-${{ matrix.env }}-python-sphinx
+            mingw-w64-${{ matrix.env }}-meson-python
+
+          # mingw-w64-${{ matrix.env }}-SDL2
+          # mingw-w64-${{ matrix.env }}-SDL2_image
+          # mingw-w64-${{ matrix.env }}-SDL2_mixer
+          # mingw-w64-${{ matrix.env }}-SDL2_ttf
+          # mingw-w64-${{ matrix.env }}-freetype
+          # mingw-w64-${{ matrix.env }}-portmidi
+
+      - name: Building pygame wheel
+        run: |
+          python3 setup.py docs
+          pip3 wheel . --wheel-dir /artifacts -vvv --no-build-isolation
+
+      - name: Installing wheel
+        run: pip3 install --no-index --pre --find-links /artifacts pygame-ce
+
+      - name: Run tests
+        env:
+          SDL_VIDEODRIVER: "dummy"
+          SDL_AUDIODRIVER: "disk"
+        run: python3 -m pygame.tests -v --exclude opengl,music,timing --time_out 300