Skip to content

Commit dbb504a

Browse files
oddbookwormoddbookworm
committed
Merge branch 'main' of https://github.com/pygame-community/pygame-ce into transform.pixelate
2 parents 48ca8c5 + a88e23b commit dbb504a

File tree

110 files changed

+3666
-1487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+3666
-1487
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
runs-on: ubuntu-22.04
122122
steps:
123123
- name: Download all multiarch artifacts
124-
uses: actions/download-artifact@v4
124+
uses: actions/download-artifact@v5
125125
with:
126126
name: pygame-multiarch-armv7-dist
127127
path: ~/artifacts

‎.github/workflows/build-macos.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: Test for Mac Deps cache hit
3434
id: macdep-cache
35-
uses: actions/cache@v4.2.3
35+
uses: actions/cache@v4.2.4
3636
with:
3737
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
3838
# The hash of all files in buildconfig manylinux-build and macdependencies is
@@ -99,14 +99,14 @@ jobs:
9999
- uses: actions/checkout@v4.2.2
100100

101101
- name: pip cache
102-
uses: actions/cache@v4.2.3
102+
uses: actions/cache@v4.2.4
103103
with:
104104
path: ~/Library/Caches/pip # This cache path is only right on mac
105105
key: pip-cache-${{ matrix.macarch }}-${{ matrix.os }}
106106

107107
- name: Fetch Mac deps
108108
id: macdep-cache
109-
uses: actions/cache@v4.2.3
109+
uses: actions/cache@v4.2.4
110110
with:
111111
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
112112
key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
@@ -115,10 +115,10 @@ jobs:
115115
- name: Install uv for speed
116116
uses: astral-sh/setup-uv@v6
117117
with:
118-
version: "0.5.26"
118+
version: "0.8.3"
119119

120120
- name: Build and test wheels
121-
uses: pypa/cibuildwheel@v2.23.2
121+
uses: pypa/cibuildwheel@v3.1.3
122122

123123
- uses: actions/upload-artifact@v4
124124
with:

‎.github/workflows/build-manylinux.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v4.2.2
3737

3838
- name: Log in to the Container registry
39-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
39+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
4040
with:
4141
registry: ghcr.io
4242
username: ${{ github.actor }}
@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: Extract metadata (tags, labels) for Docker
5151
id: meta
52-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
52+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f
5353
with:
5454
images: ghcr.io/${{ github.repository }}_${{ matrix.arch }}
5555
tags: type=raw,value=${{ hashFiles('buildconfig/manylinux-build/**') }}
@@ -74,7 +74,7 @@ jobs:
7474
CIBW_MANYLINUX_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
7575
CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
7676

77-
uses: pypa/cibuildwheel@v2.23.2
77+
uses: pypa/cibuildwheel@v3.1.3
7878

7979
# We upload the generated files under github actions assets
8080
- name: Upload dist

‎.github/workflows/build-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ jobs:
4040
- name: Install uv for speed
4141
uses: astral-sh/setup-uv@v6
4242
with:
43-
version: "0.5.26"
43+
version: "0.8.3"
4444

4545
- name: Build and test wheels
46-
uses: pypa/cibuildwheel@v2.23.2
46+
uses: pypa/cibuildwheel@v3.1.3
4747

4848
- uses: actions/upload-artifact@v4
4949
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@v4.2.2
3030

3131
- name: Download all artifacts
32-
uses: actions/download-artifact@v4
32+
uses: actions/download-artifact@v5
3333
with:
3434
path: pygame-wheels
3535
merge-multiple: true

‎.github/workflows/run-ubuntu-checks.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ jobs:
5353
os: [ ubuntu-24.04 ]
5454
# check our min python (minor) version and our max python (minor) version
5555
python: [
56-
3.9.21,
57-
3.13.1
56+
3.9.23,
57+
3.13.5,
58+
3.14.0rc1
5859
]
5960

6061
env:
@@ -87,7 +88,7 @@ jobs:
8788
8889
- name: Cache debug python build
8990
id: cache-python
90-
uses: actions/cache@v4.2.3
91+
uses: actions/cache@v4.2.4
9192
with:
9293
key: ${{ matrix.python }}
9394
path: ~/.pyenv/versions/${{ matrix.python }}-debug/**

‎buildconfig/Setup.Emscripten.SDL2.in‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,22 @@ _sdl2.video = src_c/void.c
2525

2626
_sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
2727

28-
constants src_c/constants.c $(SDL) $(DEBUG)
2928
mask src_c/bitmask.c
30-
math src_c/math.c $(SDL) $(DEBUG)
3129

3230
#GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
3331
GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
3432

3533

36-
static src_c/static.c $(SDL) $(FREETYPE) $(FONT) $(MIXER) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
34+
static src_c/base.c $(SDL) $(FREETYPE) $(FONT) $(MIXER) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
3735

38-
# these should not be altered they already are in static.c merging file above
36+
# these should not be altered they already are in base.c merging file above
3937
time src_c/void.c
4038
_freetype src_c/void.c
4139
imageext src_c/void.c
4240
image src_c/void.c
43-
base src_c/void.c
4441
bufferproxy src_c/void.c
4542
color src_c/void.c
43+
constants src_c/void.c
4644
controller src_c/void.c
4745
controller_old src_c/void.c
4846
display src_c/void.c
@@ -53,6 +51,7 @@ gfxdraw src_c/void.c
5351
joystick src_c/void.c
5452
key src_c/void.c
5553
newbuffer src_c/void.c
54+
math src_c/void.c
5655
mixer_music src_c/void.c
5756
mixer src_c/void.c
5857
mouse src_c/void.c

‎buildconfig/download_win_prebuilt.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ def get_urls(x86=True, x64=True):
8282
'ec8bbf2a2d2bf754fe04b6ffc647f78aa7f4c2a1',
8383
],
8484
[
85-
'https://github.com/libsdl-org/SDL/releases/download/release-3.2.10/SDL3-devel-3.2.10-VC.zip',
86-
'7a17d6fc7aa509c0c020e16ca10f82d6b5c2fc57'
85+
'https://github.com/libsdl-org/SDL/releases/download/release-3.2.18/SDL3-devel-3.2.18-VC.zip',
86+
'96246e328e2da7c2bd2c5734d5cb98953aca8229'
8787
],
8888
[
8989
'https://github.com/pygame-community/SDL_image/releases/download/2.8.8-pgce/SDL2_image-devel-2.8.8-VCpgce.zip',
@@ -280,12 +280,12 @@ def copy(src, dst):
280280
copy(
281281
os.path.join(
282282
temp_dir,
283-
'SDL3-devel-3.2.10-VC/SDL3-3.2.10'
283+
'SDL3-devel-3.2.18-VC/SDL3-3.2.18'
284284
),
285285
os.path.join(
286286
move_to_dir,
287287
prebuilt_dir,
288-
'SDL3-3.2.10'
288+
'SDL3-3.2.18'
289289
)
290290
)
291291

‎buildconfig/macdependencies/build_mac_deps.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ cd ../manylinux-build/docker_base
6565
# install some buildtools
6666
bash buildtools/install.sh
6767

68+
# sdl dep
69+
bash libsamplerate/build-libsamplerate.sh
70+
6871
# sdl_image deps
6972
bash zlib-ng/build-zlib-ng.sh
7073
bash libpng/build-png.sh # depends on zlib

‎buildconfig/manylinux-build/docker_base/Dockerfile-aarch64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# pin version on image for CI stability
2-
FROM quay.io/pypa/manylinux2014_aarch64:2025.03.09-1
2+
FROM quay.io/pypa/manylinux2014_aarch64:2025.07.25-1
33
ENV MAKEFLAGS="-j 4"
44
ENV PG_DEP_PREFIX="/usr/local"
55

0 commit comments

Comments
 (0)