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.

Sign up for GitHub

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

Add pypy wheel building and publishing to Github actions workflow and Makefile #618

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Add pypy wheel building and publishing to Github actions workflow and Makefile #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
124812e
First past attempt to add pypy builds.
LarsDu Mar 9, 2025
8ef1fea
Restore whitespace to build-wasm
LarsDu Mar 9, 2025
7097a5f
Revert build-wasm.
LarsDu Mar 9, 2025
3a53b09
Fix whitespace and try to add linux build target for arm.
LarsDu Mar 9, 2025
1c18d11
Revert release.yml
LarsDu Mar 9, 2025
cd6cfda
Tweak whitespace on last line
LarsDu Mar 9, 2025
513cf1f
Incorporate PYTHON_IMPL to Makefile.
LarsDu Mar 9, 2025
027d817
Incorporate pypy to build.
LarsDu Mar 9, 2025
dfb88cf
Simply and deduplicate the Makefile after reviewing documentation.
LarsDu Mar 9, 2025
3b737f1
Simplify and deduplicate.
LarsDu Mar 9, 2025
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
64 changes: 49 additions & 15 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,38 @@ jobs:
fail-fast: false
matrix:
include:
# CPython builds
- target: x86_64-pc-windows-msvc
os: windows-2022
arch: x64

python-impl: cpython
python-version: "3.12"
- target: i686-pc-windows-msvc
os: windows-2022
arch: x86

python-impl: cpython
python-version: "3.12"
- target: x86_64-apple-darwin
os: macos-13
arch: x64

python-impl: cpython
python-version: "3.12"
- target: aarch64-apple-darwin
os: macos-13
arch: x64

python-impl: cpython
python-version: "3.12"
# PyPy builds
- target: x86_64-pc-windows-msvc
os: windows-2022
arch: x64
python-impl: pypy
python-version: "pypy3.10"
- target: x86_64-apple-darwin
os: macos-13
arch: x64
python-impl: pypy
python-version: "pypy3.10"
runs-on: ${{ matrix.os }}
steps:
- name: Check out repository
Expand All @@ -39,41 +55,60 @@ jobs:
with:
toolchain: nightly
components: rustfmt

- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.arch }}

- name: Install Python packages
run: pip install -r python/requirements.txt

- name: Build wheel
run: make TARGET=${{ matrix.target }}

run: make TARGET=${{ matrix.target }} PYTHON_IMPL=${{ matrix.python-impl }}
- name: Upload wheel
uses: actions/upload-artifact@v4
with:
name: pyxel-${{ matrix.target }}
name: pyxel-${{ matrix.python-impl }}-${{ matrix.target }}
path: dist/*

build-linux:
strategy:
fail-fast: false
matrix:
include:
# CPython builds
- target: x86_64-unknown-linux-gnu
image: messense/manylinux2014-cross:x86_64
python-impl: cpython
python-version: "3.12"

- target: i686-unknown-linux-gnu
image: messense/manylinux2014-cross:i686
python-impl: cpython
python-version: "3.12"

- target: aarch64-unknown-linux-gnu
image: messense/manylinux2014-cross:aarch64
python-impl: cpython
python-version: "3.12"

- target: armv7-unknown-linux-gnueabihf
image: messense/manylinux2014-cross:armv7l
python-impl: cpython
python-version: "3.12"

# PyPy builds
- target: x86_64-unknown-linux-gnu
image: messense/manylinux2014-cross:x86_64
python-impl: pypy
python-version: "pypy3.10"

- target: armv7-unknown-linux-gnueabihf
image: messense/manylinux2014-cross:armv7l
python-impl: pypy
python-version: "pypy3.10"

runs-on: ubuntu-22.04
container: ${{ matrix.image }}
Expand All @@ -94,13 +129,12 @@ jobs:
components: rustfmt

- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: ${{ matrix.python-version }}

- name: Install Python packages
run: pip install -r python/requirements.txt

- name: Build and install SDL2
run: |
SDL2_VERSION=2.0.10
Expand All @@ -123,10 +157,10 @@ jobs:
run: |
export BINDGENFLAGS="-I/usr/${{ matrix.target }}/include/SDL2 -I/usr/${{ matrix.target }}/${{ matrix.target }}/sysroot/usr/include"
export RUSTFLAGS="-L/usr/${{ matrix.target }}/lib"
make TARGET=${{ matrix.target }}
make TARGET=${{ matrix.target }} PYTHON_IMPL=${{ matrix.python-impl }}

- name: Upload wheel
uses: actions/upload-artifact@v4
with:
name: pyxel-${{ matrix.target }}
name: pyxel-${{ matrix.python-impl }}-${{ matrix.target }}
path: dist/*
78 changes: 48 additions & 30 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,26 @@ WASM_TARGET = wasm32-unknown-emscripten
RUSTUP_TOOLCHAIN=nightly-2025-02-01
CLIPPY_OPTS = -q --all-targets --all-features -- --no-deps
MATURIN_OPTS = --manylinux 2014 --auditwheel skip
PYTHON_BIN = $(if $(filter pypy,$(PYTHON_IMPL)),pypy3,python3)

# Set Python implementation (cpython or pypy)
PYTHON_IMPL ?= cpython

# Add Python implementation to wheel filename for easier identification
ifeq ($(PYTHON_IMPL),pypy)
MATURIN_OPTS += --interpreter pypy3
WHEEL_PREFIX = pypy
else
WHEEL_PREFIX = cpython
endif


ifeq ($(TARGET),)
ENSURE_TARGET =
BUILD_OPTS = --release
ENSURE_TARGET =
BUILD_OPTS = --release
else
ENSURE_TARGET = rustup target add $(TARGET) --toolchain $(RUSTUP_TOOLCHAIN)
BUILD_OPTS = --release --target $(TARGET)
ENSURE_TARGET = rustup target add $(TARGET) --toolchain $(RUSTUP_TOOLCHAIN)
BUILD_OPTS = --release --target $(TARGET)
endif

.PHONY: \
Expand Down Expand Up @@ -103,43 +116,48 @@ build: format
@$(ENSURE_TARGET)
@$(SCRIPTS_DIR)/generate_readme_abspath
@cp LICENSE $(PYTHON_DIR)/pyxel
@cd $(PYTHON_DIR); RUSTUP_TOOLCHAIN=$(RUSTUP_TOOLCHAIN) maturin build -o ../$(DIST_DIR) $(BUILD_OPTS) $(MATURIN_OPTS)
@cd $(PYTHON_DIR); RUSTUP_TOOLCHAIN=$(RUSTUP_TOOLCHAIN) PYTHON_IMPL=$(PYTHON_IMPL) maturin build -o ../$(DIST_DIR) $(BUILD_OPTS) $(MATURIN_OPTS)

install: build
ifeq ($(PYTHON_IMPL),pypy)
@pypy3 -m pip install --force-reinstall `ls -rt $(DIST_DIR)/*-$(WHEEL_PREFIX)-*.whl | tail -n 1 || ls -rt $(DIST_DIR)/*.whl | tail -n 1`
else
@pip3 install --force-reinstall `ls -rt $(DIST_DIR)/*.whl | tail -n 1`
endif

test: install
#@cd $(RUST_DIR); cargo test $(BUILD_OPTS)
@python3 -m unittest discover $(RUST_DIR)/pyxel-wrapper/tests
@pyxel run $(EXAMPLES_DIR)/01_hello_pyxel.py
@pyxel run $(EXAMPLES_DIR)/02_jump_game.py
@pyxel run $(EXAMPLES_DIR)/03_draw_api.py
@pyxel run $(EXAMPLES_DIR)/04_sound_api.py
@pyxel run $(EXAMPLES_DIR)/05_color_palette.py
@pyxel run $(EXAMPLES_DIR)/06_click_game.py
@pyxel run $(EXAMPLES_DIR)/07_snake.py
@pyxel run $(EXAMPLES_DIR)/08_triangle_api.py
@pyxel run $(EXAMPLES_DIR)/09_shooter.py
@pyxel run $(EXAMPLES_DIR)/10_platformer.py
@pyxel run $(EXAMPLES_DIR)/11_offscreen.py
@pyxel run $(EXAMPLES_DIR)/12_perlin_noise.py
@pyxel run $(EXAMPLES_DIR)/13_bitmap_font.py
@pyxel run $(EXAMPLES_DIR)/14_synthesizer.py
@pyxel run $(EXAMPLES_DIR)/15_tiled_map_file.py
@pyxel run $(EXAMPLES_DIR)/16_transform.py
@pyxel run $(EXAMPLES_DIR)/99_flip_animation.py
@pyxel play $(EXAMPLES_DIR)/30sec_of_daylight.pyxapp
@pyxel play $(EXAMPLES_DIR)/megaball.pyxapp
@pyxel play $(EXAMPLES_DIR)/8bit-bgm-gen.pyxapp
@pyxel edit $(EXAMPLES_DIR)/assets/sample.pyxres
@$(PYTHON_BIN) -m unittest discover $(RUST_DIR)/pyxel-wrapper/tests
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/01_hello_pyxel.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/02_jump_game.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/03_draw_api.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/04_sound_api.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/05_color_palette.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/06_click_game.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/07_snake.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/08_triangle_api.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/09_shooter.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/10_platformer.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/11_offscreen.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/12_perlin_noise.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/13_bitmap_font.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/14_synthesizer.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/15_tiled_map_file.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/16_transform.py
@$(PYTHON_BIN) -m pyxel run $(EXAMPLES_DIR)/99_flip_animation.py
@$(PYTHON_BIN) -m pyxel play $(EXAMPLES_DIR)/30sec_of_daylight.pyxapp
@$(PYTHON_BIN) -m pyxel play $(EXAMPLES_DIR)/megaball.pyxapp
@$(PYTHON_BIN) -m pyxel play $(EXAMPLES_DIR)/8bit-bgm-gen.pyxapp
@$(PYTHON_BIN) -m pyxel edit $(EXAMPLES_DIR)/assets/sample.pyxres
@rm -rf testapp testapp.pyxapp
@mkdir -p testapp/assets
@cp $(EXAMPLES_DIR)/10_platformer.py testapp
@cp $(EXAMPLES_DIR)/assets/platformer.pyxres testapp/assets
@pyxel package testapp testapp/10_platformer.py
@pyxel play testapp.pyxapp
@$(PYTHON_BIN) -m pyxel package testapp testapp/10_platformer.py
@$(PYTHON_BIN) -m pyxel play testapp.pyxapp
@rm -rf testapp testapp.pyxapp
@pyxel watch $(EXAMPLES_DIR) $(EXAMPLES_DIR)/01_hello_pyxel.py
@$(PYTHON_BIN) -m pyxel watch $(EXAMPLES_DIR) $(EXAMPLES_DIR)/01_hello_pyxel.py


clean-wasm:
@make clean TARGET=$(WASM_TARGET)
Expand Down