Merge pull request #2032 from swt2c/macos_py310

.azure/ci-macos-job.yml

@@ -6,26 +6,14 @@ jobs:
     vmImage: 'macOS-1015'
   strategy:
     matrix:
-      Py36:
-        python_version: '3.6.8'
-        python_pkg: 'python-3.6.8-macosx10.9.pkg'
-        python: 'python3.6'
       Py37:
-        python_version: '3.7.9'
-        python_pkg: 'python-3.7.9-macosx10.9.pkg'
-        python: 'python3.7'
+        python.version: '3.7'
       Py38:
-        python_version: '3.8.10'
-        python_pkg: 'python-3.8.10-macosx10.9.pkg'
-        python: 'python3.8'
+        python.version: '3.8'
       Py39:
-        python_version: '3.9.9'
-        python_pkg: 'python-3.9.9-macosx10.9.pkg'
-        python: 'python3.9'
+        python.version: '3.9'
       Py310:
-        python_version: '3.10.0'
-        python_pkg: 'python-3.10.0post2-macos11.pkg'
-        python: 'python3.10'
+        python.version: '3.10'
 
 
   variables: {'PYTHONUNBUFFERED': '1'}
@@ -34,36 +22,30 @@ jobs:
   - checkout: self
     submodules: recursive
 
-  - script: |
-      curl -O https://www.python.org/ftp/python/$PYTHON_VERSION/$PYTHON_PKG
-      sudo installer -pkg $PYTHON_PKG -target /
-      which $PYTHON
-      $PYTHON --version
-    displayName: 'Fetch Python'
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '$(python.version)'
 
   - script: |
-      curl -O https://bootstrap.pypa.io/get-pip.py
-      $PYTHON get-pip.py
-      $PYTHON -m pip install -U setuptools wheel
-      $PYTHON -m pip install -r requirements.txt
+      python -m pip install -U setuptools wheel
+      python -m pip install -r requirements.txt
     displayName: 'Install Python dependencies'
 
   - script: |
-      #sudo xcode-select -s /Applications/Xcode_9.4.1.app/Contents/Developer
       xcode-select --print-path
-      $PYTHON build.py --jobs=4 build_wx
+      python build.py --jobs=4 build_wx
     displayName: 'build wxWidgets'
 
   - script: |
-      $PYTHON build.py dox etg --nodoc sip
+      python build.py dox etg --nodoc sip
     displayName: 'generate code'
 
   - script: |
-      $PYTHON build.py --jobs=4 build_py
+      python build.py --jobs=4 build_py
     displayName: 'build wxPython'
 
   - script: |
-      $PYTHON build.py bdist_wheel
-      $PYTHON build.py install
-      $PYTHON -c "import wx; print(wx.version());"
+      python build.py bdist_wheel
+      python build.py install
+      python -c "import wx; print(wx.version());"
     displayName: 'build wheel and test install'