Merge pull request #135 from charris/test-3.10-available

MAINT: Try making 3.10 wheels on Windows and OSX
MacPython · Oct 17, 2021 · 809095c · 809095c
2 parents 468533c + b47efc1
commit 809095c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,9 +47,9 @@ jobs:
     - os: linux
       arch: arm64
       env:
-        - AZURE_PYTHON_VERSION="3.9"
+        - AZURE_PYTHON_VERSION=3.9
         - PLAT=aarch64
-        - MB_PYTHON_VERSION=3.10
+        - MB_PYTHON_VERSION="3.10"
         - MB_ML_VER=2014
         - CONFIG_PATH: "config_ilp64.sh"
         - DEBUG_PRINT=1

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -37,6 +37,11 @@ jobs:
           PYTHON_ARCH: 'x64'
           NPY_USE_BLAS_ILP64: 1
           BITS: 64
+        py_3.10_64:
+          PYTHON_VERSION: "3.10.x"
+          PYTHON_ARCH: 'x64'
+          NPY_USE_BLAS_ILP64: 1
+          BITS: 64
 
   - template: azure/posix.yml
     parameters:
@@ -51,23 +56,23 @@ jobs:
           #CONFIG_PATH: "config_ilp64.sh"
           #DOCKER_TEST_IMAGE: multibuild/xenial_{PLAT}
 
-        py_3.8_32:
-          MB_PYTHON_VERSION: "3.8"
-          PLAT: "i686"
-          MB_ML_VER: "2014"
-          ENV_VARS_PATH: "env_vars_32.sh"
-          DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
+        #py_3.8_32:
+          #MB_PYTHON_VERSION: "3.8"
+          #PLAT: "i686"
+          #MB_ML_VER: "2014"
+          #ENV_VARS_PATH: "env_vars_32.sh"
+          #DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
         py_3.8_64:
           MB_PYTHON_VERSION: "3.8"
           MB_ML_VER: "2014"
           CONFIG_PATH: "config_ilp64.sh"
 
-        py_3.9_32:
-          MB_PYTHON_VERSION: "3.9"
-          PLAT: "i686"
-          MB_ML_VER: "2014"
-          ENV_VARS_PATH: "env_vars_32.sh"
-          DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
+        #py_3.9_32:
+          #MB_PYTHON_VERSION: "3.9"
+          #PLAT: "i686"
+          #MB_ML_VER: "2014"
+          #ENV_VARS_PATH: "env_vars_32.sh"
+          #DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
         py_3.9_64:
           MB_PYTHON_VERSION: "3.9"
           MB_ML_VER: "2014"
@@ -106,3 +111,7 @@ jobs:
           MB_PYTHON_VERSION: "3.9"
           PLAT: universal2
           CONFIG_PATH: "config_ilp64.sh"
+        py_3.10_universal2:
+          MB_PYTHON_VERSION: "3.10"
+          PLAT: universal2
+          CONFIG_PATH: "config_ilp64.sh"
diff --git a/multibuild b/multibuild
+3 −0		common_utils.sh
+0 −1		configure_build.sh
+4 −4		library_builders.sh
+10 −5		osx_utils.sh
+3 −1		tests/test_fill_pyver.sh
+1 −1		tests/test_library_builders.sh
+0 −5		travis_linux_steps.sh