copy bits from the numpy azure configuration for windows, fix run_tests

Author: mattip

azure-pipelines.yml

@@ -22,22 +22,31 @@ jobs:
         py_3.6_32:
           PYTHON_VERSION: "3.6.x"
           PYTHON_ARCH: "x86"
+          BITS: 32
         py_3.6_64:
           PYTHON_VERSION: "3.6.x"
+          PYTHON_ARCH: 'x64'
+          BITS: 64
         py_3.7_32:
           PYTHON_VERSION: "3.7.x"
           PYTHON_ARCH: "x86"
           NIGHTLY_BUILD: "true"
+          BITS: 32
         py_3.7_64:
           PYTHON_VERSION: "3.7.x"
           NIGHTLY_BUILD: "true"
+          PYTHON_ARCH: 'x64'
+          BITS: 64
         py_3.8_32:
           PYTHON_VERSION: "3.8.x"
           PYTHON_ARCH: "x86"
           NIGHTLY_BUILD: "true"
+          BITS: 32
         py_3.8_64:
           PYTHON_VERSION: "3.8.x"
           NIGHTLY_BUILD: "true"
+          PYTHON_ARCH: 'x64'
+          BITS: 64
 
   - template: azure/posix.yml
     parameters:

azure/windows.yml

@@ -10,8 +10,6 @@ jobs:
     variables:
       BUILD_COMMIT: "v1.18.2"
       NIGHTLY_BUILD_COMMIT: "master"
-      NIGHTLY_BUILD: "false"
-      PYTHON_ARCH: "x64"
       JUNITXML: "test-data.xml"
       TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test'
     strategy:
@@ -24,6 +22,7 @@ jobs:
       - task: UsePythonVersion@0
         inputs:
           versionSpec: $(PYTHON_VERSION)
+          addToPath: true
           architecture: $(PYTHON_ARCH)
         displayName: Set python version
 
@@ -60,23 +59,37 @@ jobs:
           git reset --hard
         displayName: Checkout numpy commit
         condition: eq(variables['SKIP_BUILD'], 'false')
-      - bash: |
-          set -e
-          pushd numpy
+
+      - powershell: |
+          choco install -y mingw --forcex86 --force --version=5.3.0
+          $env:CFLAGS = "-m32"
+          $env:LDFLAGS = "-m32"
+          $env:PATH = "C:\\tools\\mingw32\\bin;" + $env:PATH
+          refreshenv
+        displayName: 'Install 32-bit mingw for 32-bit builds'
+        condition: eq(variables['BITS'], 32)
+      - powershell: |
           pip install twine wheel urllib3
           # a bit overkill, all we really need is cython
-          pip install --timeout=60 -r test_requirements.txt
+          pip install --timeout=60 -r numpy/test_requirements.txt
 
           # handle license
-          cp ../LICENSE_win32.txt LICENSE.txt
+          cp LICENSE_win32.txt numpy/LICENSE.txt
 
-          # Download and install static "openblas.a" to PYTHON/lib
-          PYTHON_DIR=$(python -c"import sys, os; print(os.path.dirname(sys.executable))")
-          LIB=$(python tools/openblas_support.py)
-          echo Copying $LIB to $PYTHON_DIR/lib
-          cp $LIB $PYTHON_DIR/lib/openblas.a
+          # Download and copy static "openblas.a", put it into LIB
+          $libdir = Join-Path $PSScriptRoot "OPENBLAS_LIB"
+          mkdir $libdir
+          $openblas_lib=$( python numpy/tools/openblas_support.py )
+          echo Copying $openblas_lib to $libdir
+          cp $openblas_lib $libdir/openblas.a
+          $env:LIB = $libdir + ";" + $env:LIB
+        displayName: Prepare the build
+        condition: eq(variables['SKIP_BUILD'], 'false')
 
+      - bash: |
           # Build the wheel
+          set -e
+          pushd numpy
           python setup.py build
           python setup.py bdist_wheel
           ls dist

config.sh

@@ -41,10 +41,10 @@ function run_tests {
     if [ -n "$IS_LINUX" ]; then
         apt-get -y update && apt-get install -y gfortran
     fi
-    python -c "$(get_test_cmd)"
+    $PYTHON_EXE -c "$(get_test_cmd)"
     # Check bundled license file
-    python ../check_license.py
+    $PYTHON_EXE ../check_license.py
     # Show BLAS / LAPACK used. Since this uses a wheel we cannot use
     # tools/openblas_config.py; tools is not part of what is shipped
-    python -c 'import numpy; numpy.show_config()'
+    $PYTHON_EXE -c 'import numpy; numpy.show_config()'
 }