mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-07-10 16:22:22 +03:00
Merge pull request #217 from radarhere/python310_linux
This commit is contained in:
commit
7fc35c0c64
1
.github/workflows/build.sh
vendored
1
.github/workflows/build.sh
vendored
|
@ -8,7 +8,6 @@ fi
|
||||||
|
|
||||||
if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
|
if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
|
||||||
if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then
|
if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then
|
||||||
MB_ML_VER="2010"
|
|
||||||
DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
|
DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
|
||||||
else
|
else
|
||||||
MB_PYTHON_OSX_VER="10.9"
|
MB_PYTHON_OSX_VER="10.9"
|
||||||
|
|
4
.github/workflows/wheels.yml
vendored
4
.github/workflows/wheels.yml
vendored
|
@ -23,8 +23,6 @@ jobs:
|
||||||
exclude:
|
exclude:
|
||||||
- os: "macos-latest"
|
- os: "macos-latest"
|
||||||
platform: "i686"
|
platform: "i686"
|
||||||
- os: "ubuntu-20.04"
|
|
||||||
python: "3.10"
|
|
||||||
include:
|
include:
|
||||||
- os: "macos-latest"
|
- os: "macos-latest"
|
||||||
os-name: "osx"
|
os-name: "osx"
|
||||||
|
@ -83,8 +81,6 @@ jobs:
|
||||||
exclude:
|
exclude:
|
||||||
- os: "macos-latest"
|
- os: "macos-latest"
|
||||||
platform: "i686"
|
platform: "i686"
|
||||||
- os: "ubuntu-20.04"
|
|
||||||
python: "3.10"
|
|
||||||
include:
|
include:
|
||||||
- os: "macos-latest"
|
- os: "macos-latest"
|
||||||
os-name: "osx"
|
os-name: "osx"
|
||||||
|
|
|
@ -19,14 +19,12 @@ jobs:
|
||||||
arch: arm64
|
arch: arm64
|
||||||
env:
|
env:
|
||||||
- PLAT=aarch64
|
- PLAT=aarch64
|
||||||
- MB_ML_VER=2014
|
|
||||||
- MB_PYTHON_VERSION=3.6
|
- MB_PYTHON_VERSION=3.6
|
||||||
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
||||||
- name: "3.7 Focal aarch64"
|
- name: "3.7 Focal aarch64"
|
||||||
arch: arm64
|
arch: arm64
|
||||||
env:
|
env:
|
||||||
- PLAT=aarch64
|
- PLAT=aarch64
|
||||||
- MB_ML_VER=2014
|
|
||||||
- MB_PYTHON_VERSION=3.7
|
- MB_PYTHON_VERSION=3.7
|
||||||
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
||||||
- name: "3.8 Focal aarch64"
|
- name: "3.8 Focal aarch64"
|
||||||
|
@ -34,7 +32,6 @@ jobs:
|
||||||
arch: arm64
|
arch: arm64
|
||||||
env:
|
env:
|
||||||
- PLAT=aarch64
|
- PLAT=aarch64
|
||||||
- MB_ML_VER=2014
|
|
||||||
- MB_PYTHON_VERSION=3.8
|
- MB_PYTHON_VERSION=3.8
|
||||||
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
||||||
- name: "3.9 Focal aarch64"
|
- name: "3.9 Focal aarch64"
|
||||||
|
@ -42,7 +39,6 @@ jobs:
|
||||||
arch: arm64
|
arch: arm64
|
||||||
env:
|
env:
|
||||||
- PLAT=aarch64
|
- PLAT=aarch64
|
||||||
- MB_ML_VER=2014
|
|
||||||
- MB_PYTHON_VERSION=3.9
|
- MB_PYTHON_VERSION=3.9
|
||||||
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
||||||
- name: "3.10 Focal aarch64"
|
- name: "3.10 Focal aarch64"
|
||||||
|
@ -50,7 +46,6 @@ jobs:
|
||||||
arch: arm64
|
arch: arm64
|
||||||
env:
|
env:
|
||||||
- PLAT=aarch64
|
- PLAT=aarch64
|
||||||
- MB_ML_VER=2014
|
|
||||||
- MB_PYTHON_VERSION=3.10
|
- MB_PYTHON_VERSION=3.10
|
||||||
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 13a01725b0f0aa551ab34aa2311cdc1c77be4337
|
Subproject commit cdffc52846355707f389808414cf8dfe31289328
|
Loading…
Reference in New Issue
Block a user