Skip to content

Commit 4936bcc

Browse files
authored
Merge pull request #259 from thewtex/python-3-12
Python 3.12
2 parents 5163523 + ae285ad commit 4936bcc

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

scripts/dockcross-manylinux-build-wheels.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
MANYLINUX_VERSION=${MANYLINUX_VERSION:=_2_28}
2222

2323
if [[ ${MANYLINUX_VERSION} == _2_28 ]]; then
24-
IMAGE_TAG=${IMAGE_TAG:=20230106-1aeaea0}
24+
IMAGE_TAG=${IMAGE_TAG:=20230926-9eb419c}
2525
elif [[ ${MANYLINUX_VERSION} == 2014 ]]; then
26-
IMAGE_TAG=${IMAGE_TAG:=20230106-1aeaea0}
26+
IMAGE_TAG=${IMAGE_TAG:=20230926-9eb419c}
2727
else
2828
echo "Unknown manylinux version ${MANYLINUX_VERSION}"
2929
exit 1;

scripts/dockcross-manylinux-set-vars.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ TARGET_ARCH=${TARGET_ARCH:=x64}
3939

4040
# Specialized manylinux image tag to use for building.
4141
if [[ ${MANYLINUX_VERSION} == _2_28 && ${TARGET_ARCH} == x64 ]]; then
42-
IMAGE_TAG=${IMAGE_TAG:=20230106-1aeaea0}
42+
IMAGE_TAG=${IMAGE_TAG:=20230926-9eb419c}
4343
elif [[ ${MANYLINUX_VERSION} == _2_28 && ${TARGET_ARCH} == aarch64 ]]; then
4444
IMAGE_TAG=${IMAGE_TAG:=2022-11-19-1b19e81}
4545
elif [[ ${MANYLINUX_VERSION} == 2014 ]]; then
46-
IMAGE_TAG=${IMAGE_TAG:=20230106-1aeaea0}
46+
IMAGE_TAG=${IMAGE_TAG:=20230926-9eb419c}
4747
else
4848
echo "Unknown manylinux version ${MANYLINUX_VERSION}"
4949
exit 1;

scripts/internal/manylinux-build-common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [[ $# -eq 0 ]]; then
1212
PYBIN=(/opt/python/*/bin)
1313
PYBINARIES=()
1414
for version in "${PYBIN[@]}"; do
15-
if [[ ${version} == *"cp37"* || ${version} == *"cp38"* || ${version} == *"cp39"* || ${version} == *"cp310"* || ${version} == *"cp311"* ]]; then
15+
if [[ ${version} == *"cp38"* || ${version} == *"cp39"* || ${version} == *"cp310"* || ${version} == *"cp311"* || ${version} == *"cp312"* ]]; then
1616
PYBINARIES+=(${version})
1717
fi
1818
done

scripts/internal/windows_build_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55
import shutil
66

7-
DEFAULT_PY_ENVS = ["37-x64", "38-x64", "39-x64", "310-x64", "311-x64"]
7+
DEFAULT_PY_ENVS = ["38-x64", "39-x64", "310-x64", "311-x64", "312-x64"]
88

99
SCRIPT_DIR = os.path.dirname(__file__)
1010
ROOT_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "..", ".."))

scripts/macpython-install-python.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ LATEST_3p6=3.6.8
5252
LATEST_3p7=3.7.9
5353
LATEST_3p8=3.8.10
5454
LATEST_3p9=3.9.13
55-
LATEST_3p10=3.10.8
56-
LATEST_3p11=3.11.0
55+
LATEST_3p10=3.10.11
56+
LATEST_3p11=3.11.4
57+
LATEST_3p12=3.12.0
5758

5859

5960
function check_python {
@@ -112,6 +113,8 @@ function fill_pyver {
112113
echo $LATEST_2p7
113114
elif [ $ver == 3 ] || [ $ver == "3.11" ]; then
114115
echo $LATEST_3p11
116+
elif [ $ver == "3.12" ]; then
117+
echo $LATEST_3p12
115118
elif [ $ver == "3.10" ]; then
116119
echo $LATEST_3p10
117120
elif [ $ver == "3.9" ]; then
@@ -405,16 +408,15 @@ function make_workon_venv {
405408
if test "$(arch)" == "arm64"; then
406409
echo "we are arm"
407410
PLAT=arm64
408-
for pyversion in $LATEST_3p9 $LATEST_3p10 $LATEST_3p11; do
411+
for pyversion in $LATEST_3p9 $LATEST_3p10 $LATEST_3p11 $LATEST_3p12; do
409412
install_macpython $pyversion 11
410413
install_virtualenv
411414
done
412415
else
413-
for pyversion in $LATEST_3p7; do
414-
install_macpython $pyversion 10.9
415-
install_virtualenv
416-
done
417-
for pyversion in $LATEST_3p8 $LATEST_3p9 $LATEST_3p10 $LATEST_3p11; do
416+
# Deployment target requirements:
417+
# * 10.9: Python 3.7
418+
# * 11: Python >= 3.8
419+
for pyversion in $LATEST_3p8 $LATEST_3p9 $LATEST_3p10 $LATEST_3p11 $LATEST_3p12; do
418420
install_macpython $pyversion 11
419421
install_virtualenv
420422
done

0 commit comments

Comments
 (0)