Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump build dependencies and use dev.py on msys2/multiarch CI #3211

Merged
merged 2 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/build-debian-multiarch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,11 @@ jobs:
install: ${{ env.INSTALL_CMD }}

# Build a wheel, install it for running unit tests.
# --no-build-isolation is passed so that preinstalled meson-python can be used
# (done for optimization reasons)
# pip does not know that ninja is installed, and tries to install it again.
# so pass --ignore-dep ninja explicitly
run: |
echo "\nBuilding pygame wheel\n"
pip3 wheel . --no-build-isolation --wheel-dir /artifacts -vvv
echo "\nInstalling wheel\n"
pip3 install --no-index --pre --break-system-packages --find-links /artifacts pygame-ce
echo "\nBuilding and installing pygame wheel\n"
PIP_BREAK_SYSTEM_PACKAGES=1 python3 dev.py --ignore-dep ninja build --wheel /artifacts --lax
echo "\nRunning tests\n"
export SDL_VIDEODRIVER=dummy
export SDL_AUDIODRIVER=disk
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
- name: Install uv for speed
uses: yezz123/setup-uv@v4
with:
uv-version: "0.4.10"
uv-version: "0.5.4"

- name: Build and test wheels
uses: pypa/[email protected]
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/build-on-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,10 @@ jobs:
# mingw-w64-${{ matrix.env }}-freetype
# mingw-w64-${{ matrix.env }}-portmidi

- name: Building pygame wheel
run: |
pip3 wheel . --wheel-dir /artifacts -vvv --no-build-isolation

- name: Installing wheel
run: pip3 install --no-index --pre --find-links /artifacts pygame-ce
# pip does not know that ninja is installed, and tries to install it again.
# so pass --ignore-dep ninja explicitly
- name: Build and install pygame wheel
run: python3 dev.py --ignore-dep ninja build --wheel /artifacts --lax

- name: Run tests
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Install uv for speed
uses: yezz123/setup-uv@v4
with:
uv-version: "0.4.10"
uv-version: "0.5.4"

- name: Build and test wheels
uses: pypa/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ def __init__(self) -> None:
"build": get_build_deps(),
"docs": get_build_deps(),
"test": {"numpy"},
"lint": {"pylint==3.3.0", "numpy"},
"stubs": {"mypy==1.11.2", "numpy"},
"format": {"pre-commit==3.8.0"},
"lint": {"pylint==3.3.1", "numpy"},
"stubs": {"mypy==1.13.0", "numpy"},
"format": {"pre-commit==4.0.1"},
}
self.deps["all"] = set()
for k in self.deps.values():
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ pygame_ce = 'pygame.__briefcase.pygame_ce:PygameCEGuiBootstrap'

[build-system]
requires = [
"meson-python<=0.16.0",
"meson<=1.5.1",
"ninja<=1.11.1.1",
"meson-python<=0.17.1",
"meson<=1.6.0",
"ninja<=1.12.1",
"cython<=3.0.11",
"sphinx<=7.2.6",
"sphinx<=8.1.3",
]
build-backend = 'mesonpy'

Expand Down
Loading