Skip to content

Commit

Permalink
Added Python 3.13
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Nov 9, 2024
1 parent 2bf9f9d commit 6b656fa
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 14 deletions.
6 changes: 4 additions & 2 deletions manylinux2014-wheel-build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ wheel:
_PYVER=311 $(MAKE) wheel
312:
_PYVER=312 $(MAKE) wheel
313:
_PYVER=313 $(MAKE) wheel

.PHONY: test
test: 312
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c ". /vpy3/bin/activate && python3 -m pip install /output/*cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl && cd /Pillow && python3 selftest.py && /usr/bin/xvfb-run -a .ci/test.sh"
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_17_x86_64.manylinux2014_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.12 manylinux2014 wheel, and puts it in the
* make wheel: Makes a Python 3.13 manylinux2014 wheel, and puts it in the
./out directory.
* make 39|310|311|312: These are specific commands to make the
* make 39|310|311|312|313: 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
6 changes: 3 additions & 3 deletions manylinux2014-wheel-build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ fi
# not strictly necessary, unless running multiple versions from the shell
rm -f /tmp/*.whl || true

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

# We have to clean up the Pillow directories, otherwise we might get
# cached builds that are not manylinux wheel compatible
Expand Down
6 changes: 4 additions & 2 deletions manylinux_2_28-wheel-build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ wheel:
_PYVER=311 $(MAKE) wheel
312:
_PYVER=312 $(MAKE) wheel
313:
_PYVER=313 $(MAKE) wheel

.PHONY: test
test: 312
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c ". /vpy3/bin/activate && python3 -m pip install /output/*cp312-manylinux_2_28_x86_64.whl && cd /Pillow && python3 selftest.py && /usr/bin/xvfb-run -a .ci/test.sh"
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"

.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.12 manylinux_2_28 wheel, and puts it in the
* make wheel: Makes a Python 3.13 manylinux_2_28 wheel, and puts it in the
./out directory.
* make 39|310|311|312: These are specific commands to make the
* make 39|310|311|312|313: 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
6 changes: 3 additions & 3 deletions manylinux_2_28-wheel-build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ fi
# not strictly necessary, unless running multiple versions from the shell
rm -f /tmp/*.whl || true

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

# We have to clean up the Pillow directories, otherwise we might get
# cached builds that are not manylinux wheel compatible
Expand Down

0 comments on commit 6b656fa

Please sign in to comment.