python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-13 13:16:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into add-pypy-3.9

Browse Source
This commit is contained in:
Andrew Murray 2022-12-12 17:19:48 +11:00
commit b0d3dcf288
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.travis.yml
View File

@ -35,6 +35,13 @@ jobs:
env: env:
- MB_ML_VER="_2_28" - MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.8 - MB_PYTHON_VERSION=3.8
- name: "3.8 musllinux_1_1 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_1_1"
- MB_ML_LIBC="musllinux"
- MB_PYTHON_VERSION=3.8
- name: "3.9 Focal manylinux2014 aarch64" - name: "3.9 Focal manylinux2014 aarch64"
os: linux os: linux
arch: arm64 arch: arm64
@ -47,6 +54,13 @@ jobs:
env: env:
- MB_ML_VER="_2_28" - MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.9 - MB_PYTHON_VERSION=3.9
- name: "3.9 musllinux_1_1 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_1_1"
- MB_ML_LIBC="musllinux"
- MB_PYTHON_VERSION=3.9
- name: "3.10 Focal manylinux2014 aarch64" - name: "3.10 Focal manylinux2014 aarch64"
os: linux os: linux
arch: arm64 arch: arm64
@ -59,6 +73,13 @@ jobs:
env: env:
- MB_ML_VER="_2_28" - MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.10 - MB_PYTHON_VERSION=3.10
- name: "3.10 musllinux_1_1 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_1_1"
- MB_ML_LIBC="musllinux"
- MB_PYTHON_VERSION=3.10
- name: "3.11 Focal manylinux_2_28 aarch64" - name: "3.11 Focal manylinux_2_28 aarch64"
os: linux os: linux
arch: arm64 arch: arm64
@ -71,6 +92,13 @@ jobs:
env: env:
- MB_ML_VER="_2_28" - MB_ML_VER="_2_28"
- MB_PYTHON_VERSION=3.11 - MB_PYTHON_VERSION=3.11
- name: "3.11 musllinux_1_1 aarch64"
os: linux
arch: arm64
env:
- MB_ML_VER="_1_1"
- MB_ML_LIBC="musllinux"
- MB_PYTHON_VERSION=3.11
before_install: before_install:
- source multibuild/common_utils.sh - source multibuild/common_utils.sh

2
config.sh
View File

@ -70,7 +70,7 @@ function pre_build {
build_simple xcb-proto 1.15.2 https://xcb.freedesktop.org/dist build_simple xcb-proto 1.15.2 https://xcb.freedesktop.org/dist
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then
build_simple xorgproto 2022.2 https://www.x.org/pub/individual/proto build_simple xorgproto 2022.2 https://www.x.org/pub/individual/proto
build_simple libXau 1.0.10 https://www.x.org/pub/individual/lib build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib
build_simple libpthread-stubs 0.4 https://xcb.freedesktop.org/dist build_simple libpthread-stubs 0.4 https://xcb.freedesktop.org/dist
cp venv/share/pkgconfig/xcb-proto.pc venv/lib/pkgconfig/xcb-proto.pc cp venv/share/pkgconfig/xcb-proto.pc venv/lib/pkgconfig/xcb-proto.pc
else else

2
multibuild

@ -1 +1 @@
Subproject commit d4b02ce8c707c8a2bcc721e29f2385149f994b1f Subproject commit b72f714bd3b98b059cf833e774b6c3f2c6101cd1