Skip to content
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
7 changes: 3 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- "ubuntu-24.04-noble-ppc64le"
- "ubuntu-24.04-noble-s390x"
# test image for manylinux-wheel build
- "fedora-41-amd64"
- "fedora-43-amd64"
# Then run the remainder
- "alpine"
- "amazon-2-amd64"
Expand All @@ -33,7 +33,6 @@ jobs:
- "debian-13-trixie-x86"
- "debian-13-trixie-amd64"
- "fedora-42-amd64"
- "fedora-43-amd64"
- "gentoo"
- "ubuntu-22.04-jammy-amd64"
- "ubuntu-22.04-jammy-amd64-valgrind"
Expand All @@ -43,9 +42,9 @@ jobs:
- "manylinux_2_28-wheel-build"
include:
- image: "manylinux2014-wheel-build"
test-image: "fedora-41-amd64"
test-image: "fedora-43-amd64"
- image: "manylinux_2_28-wheel-build"
test-image: "fedora-41-amd64"
test-image: "fedora-43-amd64"
- image: "ubuntu-24.04-noble-ppc64le"
qemu-arch: "ppc64le"
docker-args: "--platform linux/ppc64le"
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ TARGETS = \
debian-12-bookworm-amd64 \
debian-13-trixie-x86 \
debian-13-trixie-amd64 \
fedora-41-amd64 \
fedora-42-amd64 \
fedora-43-amd64 \
gentoo \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 5 additions & 3 deletions manylinux2014-wheel-build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET := $(notdir $(WD))
ROOT := $(abspath $(WD)/../Pillow)
IMAGENAME := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TARGET), $(TARGET))
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
TEST_TARGET = fedora-41-amd64
TEST_TARGET = fedora-43-amd64
TEST_IMAGE := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TEST_TARGET):$(BRANCH), pythonpillow/$(TEST_TARGET):main)

.PHONY: build
Expand All @@ -28,10 +28,12 @@ wheel:
_PYVER=312 $(MAKE) wheel
313:
_PYVER=313 $(MAKE) wheel
314:
_PYVER=314 $(MAKE) wheel

.PHONY: test
test: 313
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c ". /vpy3/bin/activate && python3 -m pip install /output/*cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl && cd /Pillow && python3 selftest.py && /usr/bin/xvfb-run -a .ci/test.sh"
test: 314
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c ". /vpy3/bin/activate && python3 -m pip install /output/*cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl && cd /Pillow && python3 selftest.py && /usr/bin/xvfb-run -a .ci/test.sh"

.PHONY: push
push:
Expand Down
4 changes: 2 additions & 2 deletions manylinux2014-wheel-build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ symbols for debugging with Valgrind/GDB.

The Makefile has several new commands:

* make wheel: Makes a Python 3.13 manylinux2014 wheel, and puts it in the
* make wheel: Makes a Python 3.14 manylinux2014 wheel, and puts it in the
./out directory.
* make 310|311|312|313: These are specific commands to make the
* make 310|311|312|313|314 These are specific commands to make the
corresponding 3.x version in the ./out directory.

The test target here is mainly to validate the image build, it is
Expand Down
4 changes: 2 additions & 2 deletions manylinux2014-wheel-build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ fi
# not strictly necessary, unless running multiple versions from the shell
rm -f /tmp/*.whl || true

# Python version, as 310,311,312,313. Defaults to 313.
# Python version, as 310,311,312,313,314. Defaults to 314.
# Matches the naming in /opt/python/
PYVER=${1:-313}
PYVER=${1:-314}
PYBIN=$(echo /opt/python/cp${PYVER}-cp${PYVER}/bin)

# We have to clean up the Pillow directories, otherwise we might get
Expand Down
8 changes: 5 additions & 3 deletions manylinux_2_28-wheel-build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET := $(notdir $(WD))
ROOT := $(abspath $(WD)/../Pillow)
IMAGENAME := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TARGET), $(TARGET))
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
TEST_TARGET = fedora-41-amd64
TEST_TARGET = fedora-43-amd64
TEST_IMAGE := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TEST_TARGET):$(BRANCH), pythonpillow/$(TEST_TARGET):main)

.PHONY: build
Expand All @@ -28,10 +28,12 @@ wheel:
_PYVER=312 $(MAKE) wheel
313:
_PYVER=313 $(MAKE) wheel
314:
_PYVER=314 $(MAKE) wheel

.PHONY: test
test: 313
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c ". /vpy3/bin/activate && python3 -m pip install /output/*cp313-*manylinux_2_28_x86_64.whl && cd /Pillow && python3 selftest.py && /usr/bin/xvfb-run -a .ci/test.sh"
test: 314
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c ". /vpy3/bin/activate && python3 -m pip install /output/*cp314-*manylinux_2_28_x86_64.whl && cd /Pillow && python3 selftest.py && /usr/bin/xvfb-run -a .ci/test.sh"

.PHONY: push
push:
Expand Down
4 changes: 2 additions & 2 deletions manylinux_2_28-wheel-build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ symbols for debugging with Valgrind/GDB.

The Makefile has several new commands:

* make wheel: Makes a Python 3.13 manylinux_2_28 wheel, and puts it in the
* make wheel: Makes a Python 3.14 manylinux_2_28 wheel, and puts it in the
./out directory.
* make 310|311|312|313: These are specific commands to make the
* make 310|311|312|313|314: These are specific commands to make the
corresponding 3.x version in the ./out directory.

The test target here is mainly to validate the image build, it is
Expand Down
4 changes: 2 additions & 2 deletions manylinux_2_28-wheel-build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ fi
# not strictly necessary, unless running multiple versions from the shell
rm -f /tmp/*.whl || true

# Python version, as 310,311,312,313. Defaults to 313.
# Python version, as 310,311,312,313|314. Defaults to 314.
# Matches the naming in /opt/python/
PYVER=${1:-313}
PYVER=${1:-314}
PYBIN=$(echo /opt/python/cp${PYVER}-cp${PYVER}/bin)

# We have to clean up the Pillow directories, otherwise we might get
Expand Down