Merge branch 'main' into support-sdlwindowid

Author: yunline

.circleci/config.yml

@@ -1,33 +1,55 @@
 # Use the latest 2.1 version of CircleCI pipeline process engine.
 # See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
+parameters:
+  GHA_Actor:
+    type: string
+    default: ""
+  GHA_Action:
+    type: string
+    default: ""
+  GHA_Event:
+    type: string
+    default: ""
+  GHA_Meta:
+    type: string
+    default: ""
 
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
   linux-arm-wheels:
     working_directory: ~/linux-wheels
     machine:
-      image: ubuntu-2004:current
+      image: ubuntu-2204:current
+      docker_layer_caching: true
+
     resource_class: arm.medium
 
     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_PRERELEASE_PYTHONS: True # for 3.12 testing
+      - CIBW_BUILD: "cp3{[7-9],10,11,12}-* pp3{[8-9],10}-*"
       - CIBW_ARCHS: aarch64
       - CIBW_SKIP: '*-musllinux_*'
-      - CIBW_MANYLINUX_AARCH64_IMAGE: pygame/manylinux2014_base_aarch64
-      - CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: pygame/manylinux2014_base_aarch64
+      - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014_base_aarch64
+      - CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: manylinux2014_base_aarch64
       - CIBW_BEFORE_BUILD: pip install Sphinx && python setup.py docs
       - CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
       - CIBW_BUILD_VERBOSITY: 2
 
     steps:
       - checkout
+      - run:
+          name: Build the aarch64 base image (and cache it)
+          working_directory: buildconfig/manylinux-build/docker_base
+          command: docker build -t manylinux2014_base_aarch64 -f Dockerfile-aarch64 .
+
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==2.12.0
+            pip3 install --user cibuildwheel==2.14.1
             PATH="$HOME/.local/bin:$PATH" cibuildwheel --output-dir wheelhouse
 
       - store_artifacts:

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

@@ -47,7 +47,7 @@ jobs:
         arch: [s390x, ppc64le]
 
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.3
 
     - name: Build sources and run tests
       uses: uraimo/[email protected]

.github/workflows/build-emsdk.yml

@@ -47,11 +47,11 @@ jobs:
       WHEELHOUSE_CYTHON: /tmp/wheelhouse/cython
 
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.3
 
     - name: Cache Cython
       id: cache-cython
-      uses: actions/cache@v3
+      uses: actions/cache@v3.3.1
       with:
         path: ${{ env.WHEELHOUSE_CYTHON }}
         key: wasm-ubuntu-cython-${{ env.LATEST_CYTHON_COMMIT }}-path-${{ env.WHEELHOUSE_CYTHON }}

.github/workflows/build-macos.yml

@@ -45,16 +45,17 @@ jobs:
         macarch: [arm64, x86_64]
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
 
       - name: Test for Mac Deps cache hit
         id: macdep-cache
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.3.1
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           # The hash of all files in buildconfig manylinux-build and macdependencies is 
           # the key to the cache. If anything changes here, the deps are built again
           key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
+          lookup-only: true
 
       # build mac deps on cache miss
       - name: Build Mac Deps
@@ -84,52 +85,64 @@ jobs:
         # of these builds take roughly the same time
         include:
           - { 
-            name: "x86_64 (CPython 3.10 and above)",
+            name: "x86_64 (CPython 3.9 - 3.12)",
             macarch: x86_64,
-            # pattern matches any 2 digit number
-            pyversions: "cp3[1-9][0-9]-*"
+            pyversions: "cp3{9,10,11,12}-*",
           }
 
           - { 
-            name: "x86_64 (Python 3.7)",
+            name: "x86_64 (CPython 3.7 and Python 3.8)",
             macarch: x86_64,
-            pyversions: "?p37-*"
+            # CPython 3.7, CPython/PyPy 3.8
+            pyversions: "cp37-* ?p38-*",
           }
 
           - { 
-            name: "x86_64 (Python 3.8)",
+            name: "x86_64 (PyPy 3.9 and 3.10)",
             macarch: x86_64,
-            pyversions: "?p38-*"
+            pyversions: "pp39-* pp310-*",
           }
 
           - { 
-            name: "x86_64 (Python 3.9)",
-            macarch: x86_64,
-            pyversions: "?p39-*"
+            name: "arm64 (CPython 3.8 - 3.10)",
+            macarch: arm64,
+            pyversions: "cp3{8,9,10}-*",
           }
 
           - { 
-            name: "arm64 (CPython 3.8 and above)",
+            name: "arm64 (CPython 3.11 - 3.12)",
             macarch: arm64,
-            # pattern matches any number from 8 to 99
-            pyversions: "cp3{8,9,[1-9][0-9]}-*"
+            pyversions: "cp3{11,12}-*",
           }
 
     env:
+      MAC_ARCH: ${{ matrix.macarch }}
       # 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
 
+      # Explicitly tell CIBW what the wheel arch deployment target should be
+      # There seems to be no better way to set this than this env
+      # We need this because our minimum is 10.11, different from default
+      # of 10.9 on x86s
+      # Related issue: https://github.com/pypa/cibuildwheel/issues/952
+      _PYTHON_HOST_PLATFORM: ${{ matrix.macarch == 'x86_64' && 'macosx-10.11-x86_64' || 'macosx-11.0-arm64'}}
+
+      # Similarly, we need to tell CIBW that the wheel's linking steps
+      # should be for 10.11 on x86
+      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macarch == 'x86_64' && '10.11' || '11.0' }}
+
       CIBW_BUILD: ${{ matrix.pyversions }}
 
+      CIBW_PRERELEASE_PYTHONS: True # for 3.12 testing
+
       # Build arm64 and x86_64 wheels too on an Intel runner.
       # Note that the arm64 wheels cannot be tested on CI in this configuration
       CIBW_ARCHS: ${{ matrix.macarch }}
 
       # Setup MacOS dependencies
       CIBW_BEFORE_ALL: |
-        export MAC_ARCH="${{ matrix.macarch }}"
         brew install pkg-config
         cd buildconfig/macdependencies
         cp -r ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} ${{ github.workspace }}/pygame_mac_deps
@@ -149,23 +162,24 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
 
       - name: pip cache
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.3.1
         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.0.2
+        uses: actions/cache@v3.3.1
         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/cibuildwheel@v2.12.1
+        uses: pypa/cibuildwheel@v2.14.1
 
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/build-manylinux.yml

@@ -54,7 +54,9 @@ jobs:
       # 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_BUILD: "cp3{[7-9],10,11}-* pp3[7-9]-*"
+      CIBW_PRERELEASE_PYTHONS: True # for 3.12 testing
+
+      CIBW_BUILD: "cp3{[7-9],10,11,12}-* pp3{[8-9],10}-*"
       CIBW_ARCHS: ${{ matrix.arch }}
 
       # skip musllinux for now
@@ -79,10 +81,10 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.3
 
     - name: Log in to the Container registry
-      uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+      uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
@@ -95,14 +97,14 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
+      uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
       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@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+      uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}
@@ -118,7 +120,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.12.1
+      uses: pypa/cibuildwheel@v2.14.1
 
     # We upload the generated files under github actions assets
     - name: Upload dist

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

@@ -51,7 +51,7 @@ jobs:
         os: [ubuntu-20.04, ubuntu-22.04]
 
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.3
 
     - name: Install deps
       # install numpy from pip and not apt because the one from pip is newer,

.github/workflows/build-windows.yml

@@ -43,6 +43,12 @@ jobs:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
       matrix:
         include:
+          - {
+            name: "CPython 3.12 (64 bit)",
+            winarch: AMD64,
+            msvc-dev-arch: x86_amd64,
+            pyversions: "cp312-*"
+          }
           - {
             name: "CPython 3.11 (64 bit)",
             winarch: AMD64,
@@ -73,6 +79,12 @@ jobs:
             msvc-dev-arch: x86_amd64,
             pyversions: "cp37-*"
           }
+          - {
+            name: "CPython 3.12 (32 bit)",
+            winarch: x86,
+            msvc-dev-arch: x86,
+            pyversions: "cp312-win32*"
+          }
           - {
             name: "CPython 3.11 (32 bit)",
             winarch: x86,
@@ -103,12 +115,6 @@ jobs:
             msvc-dev-arch: x86,
             pyversions: "cp37-win32"
           }
-          - {
-            name: "Pypy 3.7",
-            winarch: AMD64,
-            msvc-dev-arch: x86_amd64,
-            pyversions: "pp37-*"
-          }
           - {
             name: "Pypy 3.8",
             winarch: AMD64,
@@ -121,6 +127,12 @@ jobs:
             msvc-dev-arch: x86_amd64,
             pyversions: "pp39-*"
           }
+          - {
+            name: "Pypy 3.10",
+            winarch: AMD64,
+            msvc-dev-arch: x86_amd64,
+            pyversions: "pp310-*"
+          }
 
 
     env:
@@ -129,6 +141,8 @@ jobs:
       # also define environment variables needed for testing
       CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
 
+      CIBW_PRERELEASE_PYTHONS: True # for 3.12 testing
+
       CIBW_BUILD: ${{ matrix.pyversions }}
       CIBW_ARCHS: ${{ matrix.winarch }}
 
@@ -146,7 +160,7 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
 
       - uses: TheMrMilchmann/setup-msvc-dev@v2  # this lets us use the developer command prompt on windows
         with:
@@ -158,7 +172,7 @@ jobs:
           set MSSdk=1
           python -m pip install setuptools wheel requests numpy Sphinx
           python setup.py docs
-          python -m pip --disable-pip-version-check install cibuildwheel==2.12.0
+          python -m pip --disable-pip-version-check install cibuildwheel==2.14.1
           python -m cibuildwheel --output-dir wheelhouse
 
       - uses: actions/upload-artifact@v3

.github/workflows/cppcheck.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
 
       - name: Install deps
         run: |

.github/workflows/format-lint.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
 
       - name: Install deps
         run: python3 -m pip install pylint black clang-format sphinx