Skip to content

Commit 3e76717

Browse files
authored
Merge pull request #2470 from pygame-community/ankith26-deps-updates
Bump versions of many manylinux deps
2 parents 83b8453 + 7d5c5f1 commit 3e76717

35 files changed

+45
-37
lines changed

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ jobs:
3434
- CIBW_SKIP: '*-musllinux_*'
3535
- CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014_base_aarch64
3636
- CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: manylinux2014_base_aarch64
37-
- CIBW_BEFORE_BUILD: pip install Sphinx"<7.2.0" && python setup.py docs
37+
# urllib3 2.0.0+ needs a newer OpenSSL version than what the python 3.7 build in
38+
# the image has. So downgrade urllib3 for now, until we drop python 3.7 (after
39+
# which there will be no need to downgrade)
40+
- CIBW_BEFORE_BUILD: pip install Sphinx"<7.2.0" urllib3"<2.0.0" && python setup.py docs
3841
- CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
3942
- CIBW_BUILD_VERBOSITY: 2
4043

.github/workflows/build-manylinux.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,11 @@ jobs:
6161
CIBW_SKIP: '*-musllinux_*'
6262

6363
# command that runs before every build
64+
# urllib3 2.0.0+ needs a newer OpenSSL version than what the python 3.7 build in
65+
# the image has. So downgrade urllib3 for now, until we drop python 3.7 (after
66+
# which there will be no need to downgrade)
6467
CIBW_BEFORE_BUILD: |
65-
pip install Sphinx"<7.2.0"
68+
pip install Sphinx"<7.2.0" urllib3"<2.0.0"
6669
python setup.py docs
6770
6871
CIBW_TEST_COMMAND: python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688 alsa-lib-1.2.8.tar.bz2
1+
4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939 alsa-lib-1.2.10.tar.bz2

buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

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

6-
ALSA=alsa-lib-1.2.8
6+
ALSA=alsa-lib-1.2.10
77
curl -sL https://www.alsa-project.org/files/pub/lib/${ALSA}.tar.bz2 > ${ALSA}.tar.bz2
88
sha512sum -c alsa.sha512
99

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 brotli-1.0.9.tar.gz
1+
6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9 brotli-1.1.0.tar.gz

buildconfig/manylinux-build/docker_base/brotli/build-brotli.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

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

6-
BROTLI_VER=1.0.9
6+
BROTLI_VER=1.1.0
77
BROTLI=brotli-$BROTLI_VER
88

99
curl -sL --retry 10 https://github.com/google/brotli/archive/refs/tags/v${BROTLI_VER}.tar.gz > ${BROTLI}.tar.gz

buildconfig/manylinux-build/docker_base/flac/build-flac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

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

6-
FLAC=flac-1.4.2
6+
FLAC=flac-1.4.3
77

88
curl -sL --retry 10 http://downloads.xiph.org/releases/flac/${FLAC}.tar.xz > ${FLAC}.tar.xz
99
sha512sum -c flac.sha512
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20bdf0990a7432ac765037764bc8733a0d5646866fe6cc6f4868152d2a051c89676e501012ae489c7f87b3aacb45a5b30265afaca164cf0cf53ac058644a74c5 flac-1.4.2.tar.xz
1+
3cf095720bd590a588be8ccbe187d22e7a1c60ab85b1d510ce5e8a22ab0a51827b9acfeaad59bbd645a17d1f200f559255a640101b0330709a164306c0e9709e flac-1.4.3.tar.xz

buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

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

6-
FSYNTH_VER="2.3.1"
6+
FSYNTH_VER="2.3.4"
77
FSYNTH="fluidsynth-$FSYNTH_VER"
88

99
curl -sL --retry 10 https://github.com/FluidSynth/fluidsynth/archive/v${FSYNTH_VER}.tar.gz > ${FSYNTH}.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1633294bf6c714361c381151b62d9dd2c8f388490153e7964bfa14fd647a681db9ebfe1de0a06279972d6c5b30377f67361feb4db186b1faa235600f0ae02b22 fluidsynth-2.3.1.tar.gz
1+
79891116d78b9be1c38bce9e5759b9bb732c3d8ee31c6e57d1a3e2b5548879b91d19582e73ee7fb0fd243beba3bf1bbc341a26aab0b6440eef36fc55dce3e8b0 fluidsynth-2.3.4.tar.gz

0 commit comments

Comments
 (0)