Merge main

Author: dr0id

.circleci/config.yml

@@ -34,7 +34,10 @@ jobs:
       - CIBW_SKIP: '*-musllinux_*'
       - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014_base_aarch64
       - CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: manylinux2014_base_aarch64
-      - CIBW_BEFORE_BUILD: pip install Sphinx"<7.2.0" && python setup.py docs
+      # urllib3 2.0.0+ needs a newer OpenSSL version than what the python 3.7 build in 
+      # the image has. So downgrade urllib3 for now, until we drop python 3.7 (after
+      # which there will be no need to downgrade)
+      - CIBW_BEFORE_BUILD: pip install Sphinx"<7.2.0" urllib3"<2.0.0" && python setup.py docs
       - CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
       - CIBW_BUILD_VERBOSITY: 2
 
@@ -48,7 +51,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==2.15.0
+            pip3 install --user cibuildwheel==2.16.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.6.0
+    - uses: actions/checkout@v4.1.0
 
     - name: Build sources and run tests
       uses: uraimo/run-on-arch-action@v2.5.1

.github/workflows/build-emsdk.yml

@@ -47,11 +47,11 @@ jobs:
       WHEELHOUSE_CYTHON: /tmp/wheelhouse/cython
 
     steps:
-    - uses: actions/checkout@v3.6.0
+    - uses: actions/checkout@v4.1.0
 
     - name: Cache Cython
       id: cache-cython
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v3.3.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/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Test for Mac Deps cache hit
         id: macdep-cache
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.3.2
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           # The hash of all files in buildconfig manylinux-build and macdependencies is 
@@ -160,24 +160,24 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
 
       - name: pip cache
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.3.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.1
+        uses: actions/cache@v3.3.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/cibuildwheel@v2.15.0
+        uses: pypa/cibuildwheel@v2.16.0
 
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/build-manylinux.yml

@@ -61,8 +61,11 @@ jobs:
       CIBW_SKIP: '*-musllinux_*'
 
       # command that runs before every build
+      # urllib3 2.0.0+ needs a newer OpenSSL version than what the python 3.7 build in 
+      # the image has. So downgrade urllib3 for now, until we drop python 3.7 (after
+      # which there will be no need to downgrade)
       CIBW_BEFORE_BUILD: |
-        pip install Sphinx"<7.2.0"
+        pip install Sphinx"<7.2.0" urllib3"<2.0.0"
         python setup.py docs
 
       CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
@@ -79,10 +82,10 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-    - uses: actions/checkout@v3.6.0
+    - uses: actions/checkout@v4.1.0
 
     - name: Log in to the Container registry
-      uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
+      uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
@@ -95,14 +98,14 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
+      uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934
       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@2eb1c1961a95fc15694676618e422e8ba1d63825
+      uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}
@@ -118,7 +121,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.15.0
+      uses: pypa/cibuildwheel@v2.16.0
 
     # 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.6.0
+    - uses: actions/checkout@v4.1.0
 
     - name: Install deps
       # install numpy from pip and not apt because the one from pip is newer,

.github/workflows/build-windows.yml

@@ -158,7 +158,7 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
 
       - uses: TheMrMilchmann/setup-msvc-dev@v2  # this lets us use the developer command prompt on windows
         with:
@@ -170,7 +170,7 @@ jobs:
           set MSSdk=1
           python -m pip install setuptools wheel requests numpy Sphinx"<7.2.0"
           python setup.py docs
-          python -m pip --disable-pip-version-check install cibuildwheel==2.15.0
+          python -m pip --disable-pip-version-check install cibuildwheel==2.16.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.6.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Install deps
         run: |

.github/workflows/format-lint.yml

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

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

@@ -33,7 +33,7 @@ jobs:
     needs: [manylinux-aarch64, manylinux, macos, windows, sdist]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.6.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Download all artifacts
         uses: actions/download-artifact@v3