diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 991fc48d..051015a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,9 +41,9 @@ jobs: - "manylinux_2_28-wheel-build" include: - image: "manylinux2014-wheel-build" - test-image: "ubuntu-22.04-jammy-amd64" + test-image: "ubuntu-24.04-noble-amd64" - image: "manylinux_2_28-wheel-build" - test-image: "ubuntu-22.04-jammy-amd64" + test-image: "ubuntu-24.04-noble-amd64" - image: "ubuntu-22.04-jammy-arm64v8" qemu-arch: "aarch64" - image: "ubuntu-24.04-noble-ppc64le" diff --git a/manylinux2014-wheel-build/Makefile b/manylinux2014-wheel-build/Makefile index 44ebf5d7..87aedc21 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 = ubuntu-22.04-jammy-amd64 +TEST_TARGET = ubuntu-24.04-noble-amd64 TEST_IMAGE := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TEST_TARGET):$(BRANCH), pythonpillow/$(TEST_TARGET):main) .PHONY: build @@ -32,8 +32,8 @@ wheel: _PYVER=312 $(MAKE) wheel .PHONY: test -test: 310 - docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c "/vpy3/bin/pip install /output/*cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl && cd /Pillow && /vpy3/bin/python selftest.py && /usr/bin/xvfb-run -a /vpy3/bin/pytest -vx" +test: 312 + docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c "/vpy3/bin/pip install /output/*cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl && cd /Pillow && /vpy3/bin/python selftest.py && /usr/bin/xvfb-run -a /vpy3/bin/pytest -vx" .PHONY: push push: diff --git a/manylinux2014-wheel-build/README.md b/manylinux2014-wheel-build/README.md index 1af8ca53..6e0c591e 100644 --- a/manylinux2014-wheel-build/README.md +++ b/manylinux2014-wheel-build/README.md @@ -16,7 +16,7 @@ symbols for debugging with Valgrind/GDB. The Makefile has several new commands: -* make wheel: Makes a Python 3.10 manylinux2014 wheel, and puts it in the +* make wheel: Makes a Python 3.12 manylinux2014 wheel, and puts it in the ./out directory. * make 38|39|310|311|312: These are specific commands to make the corresponding 3.x version in the ./out directory. diff --git a/manylinux2014-wheel-build/build.sh b/manylinux2014-wheel-build/build.sh index 3d8a083a..312684ef 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 38,39,310,311,312. Defaults to 310. +# Python version, as 38,39,310,311,312. Defaults to 312. # Matches the naming in /opt/python/ -PYVER=${1:-310} +PYVER=${1:-312} PYBIN=$(echo /opt/python/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 0cd94f59..f61fa4f4 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 = ubuntu-22.04-jammy-amd64 +TEST_TARGET = ubuntu-24.04-noble-amd64 TEST_IMAGE := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TEST_TARGET):$(BRANCH), pythonpillow/$(TEST_TARGET):main) .PHONY: build @@ -32,8 +32,8 @@ wheel: _PYVER=312 $(MAKE) wheel .PHONY: test -test: 310 - docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c "/vpy3/bin/pip install /output/*cp310-manylinux_2_28_x86_64.whl && cd /Pillow && /vpy3/bin/python selftest.py && /usr/bin/xvfb-run -a /vpy3/bin/pytest -vx" +test: 312 + docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c "/vpy3/bin/pip install /output/*cp312-manylinux_2_28_x86_64.whl && cd /Pillow && /vpy3/bin/python selftest.py && /usr/bin/xvfb-run -a /vpy3/bin/pytest -vx" .PHONY: push push: diff --git a/manylinux_2_28-wheel-build/README.md b/manylinux_2_28-wheel-build/README.md index dffa2607..2b5460b5 100644 --- a/manylinux_2_28-wheel-build/README.md +++ b/manylinux_2_28-wheel-build/README.md @@ -16,7 +16,7 @@ symbols for debugging with Valgrind/GDB. The Makefile has several new commands: -* make wheel: Makes a Python 3.10 manylinux_2_28 wheel, and puts it in the +* make wheel: Makes a Python 3.12 manylinux_2_28 wheel, and puts it in the ./out directory. * make 38|39|310|311|312: These are specific commands to make the corresponding 3.x version in the ./out directory. diff --git a/manylinux_2_28-wheel-build/build.sh b/manylinux_2_28-wheel-build/build.sh index 3d8a083a..312684ef 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 38,39,310,311,312. Defaults to 310. +# Python version, as 38,39,310,311,312. Defaults to 312. # Matches the naming in /opt/python/ -PYVER=${1:-310} +PYVER=${1:-312} PYBIN=$(echo /opt/python/cp${PYVER}*/bin) # We have to clean up the Pillow directories, otherwise we might get