Skip to content

Commit c88107d

Browse files
aatleaatle
authored
Merge branch 'pygame-community:main' into lazy-numpy
2 parents 85bb84d + 146c43c commit c88107d

Some content is hidden

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

61 files changed

+1638
-1070
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ env:
4444
apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev -y
4545
apt-get install libfreetype6-dev libportmidi-dev fontconfig -y
4646
apt-get install python3-dev python3-pip python3-wheel python3-sphinx -y
47-
pip3 install meson-python --break-system-packages
47+
pip3 install meson-python "sphinx-autoapi<=3.3.2" --break-system-packages
4848
4949
jobs:
5050
build-multiarch:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
- name: Test for Mac Deps cache hit
5353
id: macdep-cache
54-
uses: actions/cache@v4.1.2
54+
uses: actions/cache@v4.2.0
5555
with:
5656
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
5757
# The hash of all files in buildconfig manylinux-build and macdependencies is
@@ -118,14 +118,14 @@ jobs:
118118
- uses: actions/[email protected]
119119

120120
- name: pip cache
121-
uses: actions/cache@v4.1.2
121+
uses: actions/cache@v4.2.0
122122
with:
123123
path: ~/Library/Caches/pip # This cache path is only right on mac
124124
key: pip-cache-${{ matrix.macarch }}-${{ matrix.os }}
125125

126126
- name: Fetch Mac deps
127127
id: macdep-cache
128-
uses: actions/cache@v4.1.2
128+
uses: actions/cache@v4.2.0
129129
with:
130130
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
131131
key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575

7676
- name: Build and push Docker image
7777
if: steps.inspect.outcome == 'failure'
78-
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
78+
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc
7979
with:
8080
context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
8181
file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,17 @@ jobs:
8686
cmake --build . --config Release --parallel
8787
sudo cmake --install . --config Release
8888
89+
- name: Install SDL3_image
90+
if: matrix.os != 'windows-latest'
91+
run: |
92+
git clone https://github.com/libsdl-org/SDL_image
93+
cd SDL_image
94+
mkdir build
95+
cd build
96+
cmake -DCMAKE_BUILD_TYPE=Release ..
97+
cmake --build . --config Release --parallel
98+
sudo cmake --install . --config Release
99+
89100
- name: Build with SDL3
90101
run: python3 dev.py build --sdl3
91102

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: Test typestubs
8686
run: |
87-
pip3 install mypy
87+
pip3 install mypy==1.13.0
8888
python3 buildconfig/stubs/stubcheck.py
8989
9090
# We upload the generated files under github actions assets

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
run: echo "VER=${GITHUB_REF_NAME#'release/'}" >> $GITHUB_OUTPUT
6262

6363
- name: Generate release attestation
64-
uses: actions/attest-build-provenance@v1.4.4
64+
uses: actions/attest-build-provenance@v2.1.0
6565
with:
6666
subject-path: "pygame-wheels/*"
6767

‎buildconfig/download_win_prebuilt.py‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,24 @@ def get_urls(x86=True, x64=True):
7878
url_sha1 = []
7979
url_sha1.extend([
8080
[
81-
'https://github.com/libsdl-org/SDL/releases/download/release-2.30.9/SDL2-devel-2.30.9-VC.zip',
82-
'd89a2ad46b98ba08db5ec5877cb2fde46e127825',
81+
'https://github.com/libsdl-org/SDL/releases/download/release-2.30.11/SDL2-devel-2.30.11-VC.zip',
82+
'163e3300a1450e6e7d4fff0d35b039c3eae44e79',
8383
],
8484
[
85-
'https://github.com/libsdl-org/SDL/releases/download/preview-3.1.6/SDL3-devel-3.1.6-VC.zip',
86-
'7a3b9ed85cfe735c7e106d98c4b6395a113e5d7e'
85+
'https://github.com/libsdl-org/SDL/releases/download/preview-3.1.8/SDL3-devel-3.1.8-VC.zip',
86+
'6b17cd6414d8f42b43a6006ddb2b40fd4c3b7c7b'
8787
],
8888
[
89-
'https://github.com/pygame-community/SDL_image/releases/download/2.8.2-pgce/SDL2_image-devel-2.8.2-VCpgce.zip',
90-
'983484dd816abf25cdd5bce88ac69dbca1ea713a'
89+
'https://github.com/pygame-community/SDL_image/releases/download/2.8.4-pgce/SDL2_image-devel-2.8.4-VCpgce.zip',
90+
'b9b4a5d44cab57901003255a1c1f98a42282762b'
9191
],
9292
[
93-
'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.22.0/SDL2_ttf-devel-2.22.0-VC.zip',
94-
'2d4f131909af2985b5ebc5ed296d28628c87c243'
93+
'https://github.com/libsdl-org/SDL_image/releases/download/preview-3.1.0/SDL3_image-devel-3.1.0-VC.zip',
94+
'8538fea0cc4aabba2fc64db06196f1bb76a2785f'
95+
],
96+
[
97+
'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-devel-2.24.0-VC.zip',
98+
'2d18b9a4fc2ec0eee80de2a946b088d4e6efd0ee'
9599
],
96100
[
97101
'https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.0/SDL2_mixer-devel-2.8.0-VC.zip',
@@ -205,14 +209,26 @@ def copy(src, dst):
205209
copy(
206210
os.path.join(
207211
temp_dir,
208-
'SDL2_image-devel-2.8.2-VCpgce/SDL2_image-2.8.2'
212+
'SDL2_image-devel-2.8.4-VCpgce/SDL2_image-2.8.4'
213+
),
214+
os.path.join(
215+
move_to_dir,
216+
prebuilt_dir,
217+
'SDL2_image-2.8.4'
218+
)
219+
)
220+
copy(
221+
os.path.join(
222+
temp_dir,
223+
'SDL3_image-devel-3.1.0-VC/SDL3_image-3.1.0'
209224
),
210225
os.path.join(
211226
move_to_dir,
212227
prebuilt_dir,
213-
'SDL2_image-2.8.2'
228+
'SDL3_image-3.1.0'
214229
)
215230
)
231+
216232
copy(
217233
os.path.join(
218234
temp_dir,
@@ -227,34 +243,34 @@ def copy(src, dst):
227243
copy(
228244
os.path.join(
229245
temp_dir,
230-
'SDL2_ttf-devel-2.22.0-VC/SDL2_ttf-2.22.0'
246+
'SDL2_ttf-devel-2.24.0-VC/SDL2_ttf-2.24.0'
231247
),
232248
os.path.join(
233249
move_to_dir,
234250
prebuilt_dir,
235-
'SDL2_ttf-2.22.0'
251+
'SDL2_ttf-2.24.0'
236252
)
237253
)
238254
copy(
239255
os.path.join(
240256
temp_dir,
241-
'SDL2-devel-2.30.9-VC/SDL2-2.30.9'
257+
'SDL2-devel-2.30.11-VC/SDL2-2.30.11'
242258
),
243259
os.path.join(
244260
move_to_dir,
245261
prebuilt_dir,
246-
'SDL2-2.30.9'
262+
'SDL2-2.30.11'
247263
)
248264
)
249265
copy(
250266
os.path.join(
251267
temp_dir,
252-
'SDL3-devel-3.1.6-VC/SDL3-3.1.6'
268+
'SDL3-devel-3.1.8-VC/SDL3-3.1.8'
253269
),
254270
os.path.join(
255271
move_to_dir,
256272
prebuilt_dir,
257-
'SDL3-3.1.6'
273+
'SDL3-3.1.8'
258274
)
259275
)
260276

‎buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ set -e -x
33

44
cd $(dirname `readlink -f "$0"`)
55

6-
SDL2_VER="2.30.9"
6+
SDL2_VER="2.30.11"
77
SDL2="SDL2-$SDL2_VER"
8-
IMG2_VER="2.8.2"
8+
IMG2_VER="2.8.4"
99
IMG2="SDL2_image-$IMG2_VER"
10-
TTF2_VER="2.22.0"
10+
TTF2_VER="2.24.0"
1111
TTF2="SDL2_ttf-$TTF2_VER"
1212
MIX2_VER="2.8.0"
1313
MIX2="SDL2_mixer-$MIX2_VER"

‎buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
30dfa86fcced174fef0ed78ffa53476a31765e19cdcdf8233ab92876445b4dedaa758fc42a3ec332324d13faa2daafcadcc44fc0f536a2969ef836162ec3cd36 SDL2-2.30.9.tar.gz
2-
0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454 SDL2_image-2.8.2.tar.gz
1+
cd4c040ebe4ec74250e32b401a292658353721dda30ad1066522b2a9de9a07560313978880a0bad7e7f5103cc14278fcbe27dbc5a188189e7fb6f097e7308550 SDL2-2.30.11.tar.gz
2+
a4b7436442be43b96dc7b90c9badd011da1622e283ae068b82367fcb72b7dd7a0357aec5550fe44103a77da75b8c570d5204fff11a805373f2194f92b8f71343 SDL2_image-2.8.4.tar.gz
33
5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad SDL2_mixer-2.8.0.tar.gz
4-
34a1d210d8f1b1e802139d65ba47e36033bb7881e75a8862c1b1c515565bef85e3d81ee42e952aa664de043debef387ba60088a9cf3ba3297413db39a13af912 SDL2_ttf-2.22.0.tar.gz
4+
a0f94e26f0387385f13ec1eb08ddca677d4181969073a50af387a0dce9c7bdddf393c028c8084538e01f875e19790ef7ae9a00c5106bf7ca9d21f3fcf9eee885 SDL2_ttf-2.24.0.tar.gz

‎buildconfig/stubs/gen_stubs.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ def get_all(mod: Any):
131131
f.write(misc_stubs)
132132

133133
for mod, items in pygame_all_imports.items():
134+
if mod == "pygame":
135+
mod = "."
134136
if len(items) <= 4:
135137
# try to write imports in a single line if it can fit the line limit
136138
import_items = (f"{string} as {string}" for string in items)

0 commit comments

Comments
 (0)