update windows to 2019, re-add python version task

Author: mattip

azure-pipelines.yml

@@ -48,12 +48,19 @@ jobs:
           PYTHON_VERSION: "3.8.x"
           PYTHON_ARCH: 'x64'
           BITS: 64
+
+  - template: azure/windows.yml
+    parameters:
+      name: windows
+      vmImage: windows-2019
         py_3.9_32:
-          PYTHON_VERSION: "3.9.0-beta.4"
+          # 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:
-          PYTHON_VERSION: "3.9.0-beta.4"
+          # Will use the latest up to 3.9.0
+          PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'"
           PYTHON_ARCH: 'x64'
           BITS: 64
 
@@ -90,6 +97,18 @@ jobs:
         py_3.8_64:
           MB_PYTHON_VERSION: "3.8"
           MB_ML_VER: "2010"
+        py_3.9_32manylinux2010:
+          MB_PYTHON_VERSION: "3.9"
+          AZURE_PYTHON_VERSION: "3.8"
+          PLAT: "i686"
+          MB_ML_VER: "2010"
+          MB_ML_VER: "1"
+          ENV_VARS_PATH: "env_vars_32.sh"
+        py_3.9_64manylinux2010:
+          MB_PYTHON_VERSION: "3.9"
+          AZURE_PYTHON_VERSION: "3.8"
+          MB_ML_VER: "2010"
+
         # manylinux1 wheels
         py_3.6_32manylinux1:
           MB_PYTHON_VERSION: "3.6"
@@ -115,15 +134,6 @@ jobs:
         py_3.8_64manylinux1:
           MB_PYTHON_VERSION: "3.8"
           MB_ML_VER: "1"
-        py_3.9_32manylinux1:
-          MB_PYTHON_VERSION: "3.9"
-          PLAT: "i686"
-          MB_ML_VER: "1"
-          ENV_VARS_PATH: "env_vars_32.sh"
-        py_3.9_64manylinux1:
-          MB_PYTHON_VERSION: "3.9"
-          MB_ML_VER: "1"
-
 
   - template: azure/posix.yml
     parameters:

azure/posix.yml

@@ -23,6 +23,11 @@ jobs:
       - checkout: self
         submodules: true
 
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: $[coalesce(variables.AZURE_PYTHON_VERSION, variables.MB_PYTHON_VERSION)]
+        displayName: Set python version
+
       - bash: |
           set -e