diff --git a/.github/workflows/wheels-linux.yml b/.github/workflows/wheels-linux.yml index 548f82175..e3fbf6ac6 100644 --- a/.github/workflows/wheels-linux.yml +++ b/.github/workflows/wheels-linux.yml @@ -28,6 +28,7 @@ jobs: "3.9", "3.10", "3.11", + "3.12", ] platform: [ "i686", "x86_64" ] mb-ml-libc: [ "manylinux" ] @@ -35,6 +36,8 @@ jobs: exclude: - platform: "i686" mb-ml-ver: "_2_28" + - platform: "i686" + python: "3.12" include: - python: "3.8" platform: "x86_64" @@ -52,6 +55,10 @@ jobs: platform: "x86_64" mb-ml-libc: "musllinux" mb-ml-ver: "_1_1" + - python: "3.12" + platform: "x86_64" + mb-ml-libc: "musllinux" + mb-ml-ver: "_1_1" env: BUILD_COMMIT: ${{ inputs.build-commit }} PLAT: ${{ matrix.platform }} diff --git a/.github/workflows/wheels-macos.yml b/.github/workflows/wheels-macos.yml index fba8b7dc7..8e1b4e507 100644 --- a/.github/workflows/wheels-macos.yml +++ b/.github/workflows/wheels-macos.yml @@ -28,6 +28,7 @@ jobs: "3.9", "3.10", "3.11", + "3.12", ] platform: [ "x86_64", "arm64" ] exclude: diff --git a/.travis.yml b/.travis.yml index dc3ddab74..1cfde811c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,6 +89,25 @@ jobs: - MB_ML_VER="_1_1" - MB_ML_LIBC="musllinux" - MB_PYTHON_VERSION=3.11 + - name: "3.12 Focal manylinux_2_28 aarch64" + os: linux + arch: arm64 + env: + - MB_ML_VER=2014 + - MB_PYTHON_VERSION=3.12 + - name: "3.12 Focal manylinux_2_28 aarch64" + os: linux + arch: arm64 + env: + - MB_ML_VER="_2_28" + - MB_PYTHON_VERSION=3.12 + - name: "3.12 musllinux_1_1 aarch64" + os: linux + arch: arm64 + env: + - MB_ML_VER="_1_1" + - MB_ML_LIBC="musllinux" + - MB_PYTHON_VERSION=3.12 before_install: - source multibuild/common_utils.sh diff --git a/config.sh b/config.sh index 422ec9678..ed8dd5fdf 100644 --- a/config.sh +++ b/config.sh @@ -141,7 +141,11 @@ function run_tests_in_repo { EXP_CODECS="jpg jpg_2000 libtiff zlib" EXP_MODULES="freetype2 littlecms2 pil tkinter webp" -EXP_FEATURES="fribidi harfbuzz libjpeg_turbo raqm transp_webp webp_anim webp_mux xcb" +if ([ -n "$IS_MACOS" ] && [[ "$MB_PYTHON_VERSION" == 3.12 ]]); then + EXP_FEATURES="libjpeg_turbo transp_webp webp_anim webp_mux xcb" +else + EXP_FEATURES="fribidi harfbuzz libjpeg_turbo raqm transp_webp webp_anim webp_mux xcb" +fi function run_tests { if [ -n "$IS_MACOS" ]; then @@ -156,7 +160,7 @@ function run_tests { if [[ "$MB_PYTHON_VERSION" != 3.11 ]]; then python3 -m pip install numpy==1.21 fi - elif [ -z "$IS_ALPINE" ]; then + elif [ -z "$IS_ALPINE" ] && [[ "$MB_PYTHON_VERSION" != 3.12 ]]; then python3 -m pip install numpy fi diff --git a/multibuild b/multibuild index b72f714bd..3821310e4 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit b72f714bd3b98b059cf833e774b6c3f2c6101cd1 +Subproject commit 3821310e40514196265889dada25b0e6086c9fc4