Skip to content
This repository has been archived by the owner on Oct 8, 2024. It is now read-only.

Commit

Permalink
Merge pull request #383 from radarhere/python312
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk authored May 31, 2023
2 parents 899d7c5 + 8f22604 commit 73b28de
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/wheels-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,16 @@ jobs:
"3.9",
"3.10",
"3.11",
"3.12",
]
platform: [ "i686", "x86_64" ]
mb-ml-libc: [ "manylinux" ]
mb-ml-ver: [ 2014, "_2_28" ]
exclude:
- platform: "i686"
mb-ml-ver: "_2_28"
- platform: "i686"
python: "3.12"
include:
- python: "3.8"
platform: "x86_64"
Expand All @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/wheels-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
"3.9",
"3.10",
"3.11",
"3.12",
]
platform: [ "x86_64", "arm64" ]
exclude:
Expand Down
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 73b28de

Please sign in to comment.