Skip to content

Commit 746197d

Browse files
authored
Merge pull request #3211 from pygame-community/ankith26-bump-build-deps
Bump build dependencies and use `dev.py` on msys2/multiarch CI
2 parents dfbe4d0 + a6e2647 commit 746197d

File tree

6 files changed

+17
-21
lines changed

6 files changed

+17
-21
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,11 @@ jobs:
9696
install: ${{ env.INSTALL_CMD }}
9797

9898
# Build a wheel, install it for running unit tests.
99-
# --no-build-isolation is passed so that preinstalled meson-python can be used
100-
# (done for optimization reasons)
99+
# pip does not know that ninja is installed, and tries to install it again.
100+
# so pass --ignore-dep ninja explicitly
101101
run: |
102-
echo "\nBuilding pygame wheel\n"
103-
pip3 wheel . --no-build-isolation --wheel-dir /artifacts -vvv
104-
echo "\nInstalling wheel\n"
105-
pip3 install --no-index --pre --break-system-packages --find-links /artifacts pygame-ce
102+
echo "\nBuilding and installing pygame wheel\n"
103+
PIP_BREAK_SYSTEM_PACKAGES=1 python3 dev.py --ignore-dep ninja build --wheel /artifacts --lax
106104
echo "\nRunning tests\n"
107105
export SDL_VIDEODRIVER=dummy
108106
export SDL_AUDIODRIVER=disk

.github/workflows/build-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
- name: Install uv for speed
135135
uses: yezz123/setup-uv@v4
136136
with:
137-
uv-version: "0.4.10"
137+
uv-version: "0.5.4"
138138

139139
- name: Build and test wheels
140140
uses: pypa/[email protected]

.github/workflows/build-on-msys2.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,10 @@ jobs:
6868
# mingw-w64-${{ matrix.env }}-freetype
6969
# mingw-w64-${{ matrix.env }}-portmidi
7070

71-
- name: Building pygame wheel
72-
run: |
73-
pip3 wheel . --wheel-dir /artifacts -vvv --no-build-isolation
74-
75-
- name: Installing wheel
76-
run: pip3 install --no-index --pre --find-links /artifacts pygame-ce
71+
# pip does not know that ninja is installed, and tries to install it again.
72+
# so pass --ignore-dep ninja explicitly
73+
- name: Build and install pygame wheel
74+
run: python3 dev.py --ignore-dep ninja build --wheel /artifacts --lax
7775

7876
- name: Run tests
7977
env:

.github/workflows/build-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Install uv for speed
6060
uses: yezz123/setup-uv@v4
6161
with:
62-
uv-version: "0.4.10"
62+
uv-version: "0.5.4"
6363

6464
- name: Build and test wheels
6565
uses: pypa/[email protected]

dev.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ def __init__(self) -> None:
196196
"build": get_build_deps(),
197197
"docs": get_build_deps(),
198198
"test": {"numpy"},
199-
"lint": {"pylint==3.3.0", "numpy"},
200-
"stubs": {"mypy==1.11.2", "numpy"},
201-
"format": {"pre-commit==3.8.0"},
199+
"lint": {"pylint==3.3.1", "numpy"},
200+
"stubs": {"mypy==1.13.0", "numpy"},
201+
"format": {"pre-commit==4.0.1"},
202202
}
203203
self.deps["all"] = set()
204204
for k in self.deps.values():

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ pygame_ce = 'pygame.__briefcase.pygame_ce:PygameCEGuiBootstrap'
5353

5454
[build-system]
5555
requires = [
56-
"meson-python<=0.16.0",
57-
"meson<=1.5.1",
58-
"ninja<=1.11.1.1",
56+
"meson-python<=0.17.1",
57+
"meson<=1.6.0",
58+
"ninja<=1.12.1",
5959
"cython<=3.0.11",
60-
"sphinx<=7.2.6",
60+
"sphinx<=8.1.3",
6161
]
6262
build-backend = 'mesonpy'
6363

0 commit comments

Comments
 (0)