Merge branch 'main' of https://github.com/pygame-community/pygame-ce into gpu-sprite

oddbookworm · oddbookworm · commit d45406167718 · 2024-08-05T20:21:54.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,7 +42,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==2.19.2
+            pip3 install --user cibuildwheel==2.20.0
             PATH="$HOME/.local/bin:$PATH" cibuildwheel --output-dir wheelhouse
 
       - store_artifacts:
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -138,7 +138,7 @@ jobs:
           uv-version: "0.2.22"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.19.2
+        uses: pypa/cibuildwheel@v2.20.0
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/build-manylinux.yml b/.github/workflows/build-manylinux.yml
@@ -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.19.2
+      uses: pypa/cibuildwheel@v2.20.0
 
     # We upload the generated files under github actions assets
     - name: Upload dist
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -62,7 +62,7 @@ jobs:
           uv-version: "0.2.22"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.19.2
+        uses: pypa/cibuildwheel@v2.20.0
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/buildconfig/download_win_prebuilt.py b/buildconfig/download_win_prebuilt.py
@@ -78,8 +78,8 @@ def get_urls(x86=True, x64=True):
     url_sha1 = []
     url_sha1.extend([
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-2.30.5/SDL2-devel-2.30.5-VC.zip',
-        '035842a7061f3ab4f9d469bab9a3874587a07c74',
+        'https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-devel-2.30.6-VC.zip',
+        '038ffed56e04fbc4c6236187472c671596963fdb',
         ],
         [
         'https://github.com/pygame-community/SDL_image/releases/download/2.8.2-pgce/SDL2_image-devel-2.8.2-VCpgce.zip',
@@ -234,12 +234,12 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.30.5-VC/SDL2-2.30.5'
+                'SDL2-devel-2.30.6-VC/SDL2-2.30.6'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.30.5'
+                'SDL2-2.30.6'
             )
         )
 
diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 b/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64
@@ -1,4 +1,5 @@
-FROM quay.io/pypa/manylinux2014_aarch64
+# pin version on image for CI stability
+FROM quay.io/pypa/manylinux2014_aarch64:2024.08.03-1
 ENV MAKEFLAGS="-j 2"
 ENV PG_DEP_PREFIX="/usr/local"
 
diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-i686 b/buildconfig/manylinux-build/docker_base/Dockerfile-i686
@@ -1,4 +1,5 @@
-FROM quay.io/pypa/manylinux2014_i686
+# pin version on image for CI stability
+FROM quay.io/pypa/manylinux2014_i686:2024.08.03-1
 ENV MAKEFLAGS="-j 2"
 ENV PG_DEP_PREFIX="/usr/local"
 
diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 b/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64
@@ -1,4 +1,5 @@
-FROM quay.io/pypa/manylinux2014_x86_64
+# pin version on image for CI stability
+FROM quay.io/pypa/manylinux2014_x86_64:2024.08.03-1
 ENV MAKEFLAGS="-j 2"
 ENV PG_DEP_PREFIX="/usr/local"
 
diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-SDL2_VER="2.30.5"
+SDL2_VER="2.30.6"
 SDL2="SDL2-$SDL2_VER"
 IMG2_VER="2.8.2"
 IMG2="SDL2_image-$IMG2_VER"
diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 b/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512
@@ -1,4 +1,4 @@
-a5892d96e4bd97702aacaddebef16c0d731582539ef3eb4cf95494b81fcda2305e93ac0735074d6269833efd106b4ae194b964ef5696476d071e071ba22aadc4  SDL2-2.30.5.tar.gz
+c73fd0b52e77d248a5dc2808a660ded9e708b87f68f677970da71e9b4a25ec60cf52f319b8b014ced7c9363560f2360262c04551a895f0f83ee62c3feeafba47  SDL2-2.30.6.tar.gz
 0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454  SDL2_image-2.8.2.tar.gz
 5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad  SDL2_mixer-2.8.0.tar.gz
 34a1d210d8f1b1e802139d65ba47e36033bb7881e75a8862c1b1c515565bef85e3d81ee42e952aa664de043debef387ba60088a9cf3ba3297413db39a13af912  SDL2_ttf-2.22.0.tar.gz
diff --git a/meson.build b/meson.build
@@ -86,7 +86,7 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
         )
     endif
 
-    sdl_ver = '2.30.5'
+    sdl_ver = '2.30.6'
     sdl_image_ver = '2.8.2'
     sdl_mixer_ver = '2.8.0'
     sdl_ttf_ver = '2.22.0'
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,6 +19,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Games/Entertainment",
@@ -73,7 +74,7 @@ install = ['--tags=runtime,python-runtime,pg-tag']
 # dependencies. Here is where uv comes into the picture. It is an "installer" like pip,
 # but faster. It has been observed to save a couple of minutes of CI time.
 build-frontend = "build[uv]"
-build = "cp3{8,9,10,11,12}-* pp3{8,9,10}-*"
+build = "cp3{8,9,10,11,12,13}-* pp3{8,9,10}-*"
 skip = "*-musllinux_*"
 # build[uv] is verbose by default, so below flag is not needed here
 # build-verbosity = 3
@@ -109,6 +110,7 @@ only-binary = ["numpy"]
 # 1. skip all 32-bit manylinux (i686) 
 # 2. skip all pypy+arm combinations
 # 3. skip all pypy 310 because it is so new numpy does not have wheels for it
+# 4. skip all python 313 because numpy doesn't have wheels for it yet
 [[tool.cibuildwheel.overrides]]
-select = "{*-manylinux_i686,pp*-*{arm64,aarch64},pp310-*}"
+select = "{*-manylinux_i686,pp*-*{arm64,aarch64},pp310-*,*p313-*}"
 test-requires = []
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [tox:tox]
-envlist = py{38,39,310,311,312}
+envlist = py{38,39,310,311,312,313}
 skip_missing_interpreters = True
 skipsdist = True
 
diff --git a/setup.py b/setup.py
@@ -44,6 +44,7 @@
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Games/Entertainment",
diff --git a/test/window_test.py b/test/window_test.py
@@ -329,6 +329,7 @@ def test_from_display_module(self):
         pygame.display.quit()
         pygame.init()
 
+    @unittest.skipIf(IS_PYPY, "for some reason this test is flaky on pypy")
     def test_window_surface(self):
         win = Window(size=(640, 480))
         surf = win.get_surface()

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ def get_urls(x86=True, x64=True):`
`78`	`78`	`url_sha1 = []`
`79`	`79`	`url_sha1.extend([`
`80`	`80`	`[`
`81`		`- 'https://github.com/libsdl-org/SDL/releases/download/release-2.30.5/SDL2-devel-2.30.5-VC.zip',`
`82`		`- '035842a7061f3ab4f9d469bab9a3874587a07c74',`
	`81`	`+ 'https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-devel-2.30.6-VC.zip',`
	`82`	`+ '038ffed56e04fbc4c6236187472c671596963fdb',`
`83`	`83`	`],`
`84`	`84`	`[`
`85`	`85`	`'https://github.com/pygame-community/SDL_image/releases/download/2.8.2-pgce/SDL2_image-devel-2.8.2-VCpgce.zip',`
`@@ -234,12 +234,12 @@ def copy(src, dst):`
`234`	`234`	`copy(`
`235`	`235`	`os.path.join(`
`236`	`236`	`temp_dir,`
`237`		`- 'SDL2-devel-2.30.5-VC/SDL2-2.30.5'`
	`237`	`+ 'SDL2-devel-2.30.6-VC/SDL2-2.30.6'`
`238`	`238`	`),`
`239`	`239`	`os.path.join(`
`240`	`240`	`move_to_dir,`
`241`	`241`	`prebuilt_dir,`
`242`		`- 'SDL2-2.30.5'`
	`242`	`+ 'SDL2-2.30.6'`
`243`	`243`	`)`
`244`	`244`	`)`
`245`	`245`