Unset DSK variables before tests

Author: matthew-brett

azure-pipelines.yml

@@ -29,77 +29,3 @@ jobs:
           PYTHON_ARCH: 'x64'
           NPY_USE_BLAS_ILP64: 1
           BITS: 64
-        py_3.9_32:
-          PYTHON_VERSION: "3.9.x"
-          PYTHON_ARCH: "x86"
-          BITS: 32
-        py_3.9_64:
-          PYTHON_VERSION: "3.9.x"
-          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:
-      name: linux
-      vmImage: ubuntu-18.04
-      timeoutInMinutes: 90
-      matrix:
-        pypy_3.8_64:
-          MB_PYTHON_VERSION: "pypy3.8-7.3.7"
-          AZURE_PYTHON_VERSION: "3.8"
-          MB_ML_VER: "2014"
-          CONFIG_PATH: "config_ilp64.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"
-          DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
-
-        py_3.9_64:
-          MB_PYTHON_VERSION: "3.9"
-          MB_ML_VER: "2014"
-          CONFIG_PATH: "config_ilp64.sh"
-          DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
-
-        py_3.10_64:
-          MB_PYTHON_VERSION: "3.10"
-          MB_ML_VER: "2014"
-          CONFIG_PATH: "config_ilp64.sh"
-          DOCKER_TEST_IMAGE: "multibuild/focal_{PLAT}"
-
-  - template: azure/posix.yml
-    parameters:
-      name: macOS
-      vmImage: macOS-10.15
-      timeoutInMinutes: 90
-      matrix:
-        py_3.8_64:
-          MB_PYTHON_VERSION: "3.8"
-          CONFIG_PATH: "config_ilp64.sh"
-        py_3.9_64:
-          MB_PYTHON_VERSION: "3.9"
-          CONFIG_PATH: "config_ilp64.sh"
-        py_3.10_64:
-          MB_PYTHON_VERSION: "3.10"
-          CONFIG_PATH: "config_ilp64.sh"
-
-        py_3.8_universal2:
-          MB_PYTHON_VERSION: "3.8"
-          PLAT: universal2
-          CONFIG_PATH: "config_ilp64.sh"
-        py_3.9_universal2:
-          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"

azure/windows.yml

@@ -61,6 +61,7 @@ jobs:
           python -c "import struct; print(struct.calcsize('P') * 8)"
           python -m pip --version
         displayName: Check that we have the expected version and architecture for Python
+
       - bash: |
           set -e
           if [ "$BUILD_REASON" == "Schedule" ]; then
@@ -123,12 +124,17 @@ jobs:
           }
           # Build the wheel
           pushd numpy
-          python setup.py build
+          echo "SDK setting: $env:DISTUTILS_USE_SDK"
+          get-command cl
+          python setup.py -v -v build
           python setup.py bdist_wheel
           twine check dist/*
           popd
         displayName: Build wheel
+
       - bash: |
+          # Undo use specify VS build tools.
+          unset DISTUTILS_USE_SDK MSSdk
           set -ex
           source extra_functions.sh
           source config.sh