refactoring

Author: mattip

azure-pipelines.yml

@@ -16,55 +16,14 @@ variables:
 jobs:
   - template: azure/windows.yml
     parameters:
-      name: windows2017
-      vmImage: vs2017-win2016
+      name: windows
+      os: windows-latest
       matrix:
-        py_3.6_32:
-          PYTHON_VERSION: "3.6.x"
-          PYTHON_ARCH: "x86"
-          BITS: 32
-        pypy_3.6_32:
-          PYTHON_VERSION: "PyPy3.6"
-          PYTHON_ARCH: "x86"
-          BITS: 32
-          EXTRA_ARGV: "'-m', 'not slow'"
-        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"
-          BITS: 32
-        py_3.7_64:
-          PYTHON_VERSION: "3.7.x"
-          PYTHON_ARCH: 'x64'
-          BITS: 64
-        py_3.8_32:
-          PYTHON_VERSION: "3.8.x"
-          PYTHON_ARCH: "x86"
-          BITS: 32
-        py_3.8_64:
-          PYTHON_VERSION: "3.8.x"
-          PYTHON_ARCH: 'x64'
-          BITS: 64
-
-  - template: azure/windows.yml
-    parameters:
-      name: windows2019
-      vmImage: windows-2019
-      matrix:
-        py_3.9_32:
-          # Will use the latest up to 3.9.0
-          PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'"
-          PYTHON_ARCH: "x86"
-          BITS: 32
-        py_3.9_64:
-          # Will use the latest up to 3.9.0
-          PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'"
-          PYTHON_ARCH: 'x64'
-          BITS: 64
-
+        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        architecture: [x86, x64]
+        exclude:
+          - python-version: pypy3
+            architecture: x64
 
   - template: azure/posix.yml
     parameters:

azure/posix.yml

@@ -23,6 +23,14 @@ jobs:
       - checkout: self
         submodules: true
 
+      - bash |
+          set -ex
+          echo AZURE_PYTHON_VERSION ${{ variables.AZURE_PYTHON_VERSION }}
+          echo MB_PYTHON_VERSION ${{ variables.MB_PYTHON_VERSION }}
+          echo coalesce ${{ coalesce(variables.AZURE_PYTHON_VERSION, variables.MB_PYTHON_VERSION) }}
+        displayName: DEBUG - erase me
+
+
       - task: UsePythonVersion@0
         inputs:
           versionSpec: ${{ coalesce(variables.AZURE_PYTHON_VERSION, variables.MB_PYTHON_VERSION) }}

azure/windows.yml

@@ -17,14 +17,13 @@ jobs:
     steps:
       - checkout: self
         submodules: true
-
-      - task: UsePythonVersion@0
-        inputs:
-          versionSpec: $(PYTHON_VERSION)
-          addToPath: true
-          architecture: $(PYTHON_ARCH)
-        displayName: Set python version
-        condition: not(contains(variables['PYTHON_VERSION'], 'PyPy'))
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.architecture }}
+        condition: ${{ not( contains( matrix.python-version , 'PyPy')) }}
 
       - powershell: |
           $url = "http://buildbot.pypy.org/nightly/py3.6/pypy-c-jit-latest-win32.zip"
@@ -41,12 +40,11 @@ jobs:
           setx PATH $env:Path
           python -mensurepip
           echo "##vso[task.prependpath]$pypypath"
-        condition: contains(variables['PYTHON_VERSION'], 'PyPy')
+        condition: ${{ contains( matrix.python-version , 'PyPy') }}
         displayName: "Install PyPy pre-release"
 
       - bash: |
           set -e
-          echo PYTHON $PYTHON_VERSION $PYTHON_ARCH
           echo Build Reason: $BUILD_REASON
           python --version
           python -c "import struct; print(struct.calcsize('P') * 8)"
@@ -75,8 +73,12 @@ jobs:
 
       - powershell: |
           choco install -y mingw --forcex86 --force --version=7.3.0
+          echo "##vso[task.setvariable variable=CFLAGS]-m32"
+          echo "##vso[task.setvariable variable=LDFLAGS]-m32"
+          $mingwpath = "C:\\ProgramData\\chocolatey\\lib\\mingw\\tools\\install\\mingw$(BITS)\\bin;" + $env:PATH
+          echo "##vso[task.prependpath]$mingwpath"
         displayName: 'Install 32-bit mingw for 32-bit builds'
-        condition: eq(variables['BITS'], 32)
+        condition: ${{ eq( matrix.architecture , 'x86') }}
 
       - bash: |
           set -xe
@@ -102,12 +104,6 @@ jobs:
         displayName: Prepare the build
 
       - powershell: |
-          If ($(BITS) -eq 32) {
-              $env:CFLAGS = "-m32"
-              $env:LDFLAGS = "-m32"
-              $env:PATH = "C:\\ProgramData\\chocolatey\\lib\\mingw\\tools\\install\\mingw$(BITS)\\bin;" + $env:PATH
-              refreshenv
-          }
           # Build the wheel
           pushd numpy
           python setup.py build