diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44dc803b..ae5e5700 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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" @@ -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" @@ -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" diff --git a/Makefile b/Makefile index 8ad98a79..22f6c2c7 100644 --- a/Makefile +++ b/Makefile @@ -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 \ diff --git a/fedora-41-amd64/Dockerfile b/archive/fedora-41-amd64/Dockerfile similarity index 100% rename from fedora-41-amd64/Dockerfile rename to archive/fedora-41-amd64/Dockerfile diff --git a/fedora-41-amd64/Makefile b/archive/fedora-41-amd64/Makefile similarity index 100% rename from fedora-41-amd64/Makefile rename to archive/fedora-41-amd64/Makefile diff --git a/fedora-41-amd64/test.sh b/archive/fedora-41-amd64/test.sh similarity index 100% rename from fedora-41-amd64/test.sh rename to archive/fedora-41-amd64/test.sh diff --git a/fedora-41-amd64/update.sh b/archive/fedora-41-amd64/update.sh similarity index 100% rename from fedora-41-amd64/update.sh rename to archive/fedora-41-amd64/update.sh diff --git a/manylinux2014-wheel-build/Makefile b/manylinux2014-wheel-build/Makefile index 152a4662..92784d7a 100644 --- a/manylinux2014-wheel-build/Makefile +++ b/manylinux2014-wheel-build/Makefile @@ -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 @@ -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: diff --git a/manylinux2014-wheel-build/README.md b/manylinux2014-wheel-build/README.md index f0873671..4ea7dfcb 100644 --- a/manylinux2014-wheel-build/README.md +++ b/manylinux2014-wheel-build/README.md @@ -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 diff --git a/manylinux2014-wheel-build/build.sh b/manylinux2014-wheel-build/build.sh index 9499487d..78e056eb 100755 --- a/manylinux2014-wheel-build/build.sh +++ b/manylinux2014-wheel-build/build.sh @@ -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 diff --git a/manylinux_2_28-wheel-build/Makefile b/manylinux_2_28-wheel-build/Makefile index 1532e308..9f7021ef 100644 --- a/manylinux_2_28-wheel-build/Makefile +++ b/manylinux_2_28-wheel-build/Makefile @@ -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 @@ -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: diff --git a/manylinux_2_28-wheel-build/README.md b/manylinux_2_28-wheel-build/README.md index 1acc96b3..a0d0e3b0 100644 --- a/manylinux_2_28-wheel-build/README.md +++ b/manylinux_2_28-wheel-build/README.md @@ -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 diff --git a/manylinux_2_28-wheel-build/build.sh b/manylinux_2_28-wheel-build/build.sh index 9499487d..d20b532b 100755 --- a/manylinux_2_28-wheel-build/build.sh +++ b/manylinux_2_28-wheel-build/build.sh @@ -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