Merge pull request #215 from radarhere/python310

python-pillow · Aug 15, 2021 · 668fa3d · 668fa3d
2 parents d2eeaa5 + 812155d
commit 668fa3d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -17,17 +17,24 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-20.04", "macos-latest" ]
-        python: [ "pypy3.7-7.3.3","pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9" ]
+        python: [ "pypy3.7-7.3.3", "pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9", "3.10" ]
         platform: [ "x86_64", "i686" ]
         macos-target: [ "10.10" ]
         exclude:
           - os: "macos-latest"
             platform: "i686"
+          - os: "ubuntu-20.04"
+            python: "3.10"
         include:
           - os: "macos-latest"
             os-name: "osx"
           - os: "ubuntu-20.04"
             os-name: "focal"
+          - os: "macos-11"
+            os-name: "osx"
+            platform: "arm64"
+            python: "3.10"
+            macos-target: "11.0"
           - os: "macos-11"
             os-name: "osx"
             platform: "arm64"
@@ -70,17 +77,24 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-20.04", "macos-latest" ]
-        python: [ "pypy3.7-7.3.3", "pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9" ]
+        python: [ "pypy3.7-7.3.3", "pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9", "3.10" ]
         platform: [ "x86_64", "i686" ]
         macos-target: [ "10.10" ]
         exclude:
           - os: "macos-latest"
             platform: "i686"
+          - os: "ubuntu-20.04"
+            python: "3.10"
         include:
           - os: "macos-latest"
             os-name: "osx"
           - os: "ubuntu-20.04"
             os-name: "focal"
+          - os: "macos-11"
+            os-name: "osx"
+            platform: "arm64"
+            python: "3.10"
+            macos-target: "11.0"
           - os: "macos-11"
             os-name: "osx"
             platform: "arm64"

diff --git a/config.sh b/config.sh
@@ -132,7 +132,7 @@ function run_tests {
         else
             python3 -m pip install numpy==1.20.3
         fi
-    else
+    elif [[ "$MB_PYTHON_VERSION" != 3.10 ]] || [[ "$PLAT" != "x86_64" ]]; then
         python3 -m pip install numpy
     fi
 

diff --git a/multibuild b/multibuild