Merge pull request #128 from actions/v-mkoliada/clean_macos-10.15_migration

Migrate macOS pipelines to macOS-10.15

azure-pipelines/build-python-packages.yml

@@ -6,7 +6,7 @@ stages:
 - stage: Build_Python_MacOS
   dependsOn: []
   variables:
-    VmImage: 'macOS-10.14'
+    VmImage: 'macOS-10.15'
     Platform: darwin
     Architecture: x64
   jobs:
@@ -16,7 +16,7 @@ stages:
   condition: succeeded()
   dependsOn: Build_Python_MacOS
   variables:
-    VmImage: 'macOS-10.14'
+    VmImage: 'macOS-10.15'
     Platform: darwin
     Architecture: x64
   jobs:

azure-pipelines/templates/test-job.yml

@@ -1,6 +1,6 @@
 jobs:
 - job: Test_Python
-  pool: 
+  pool:
     name: Azure Pipelines
     vmImage: $(VmImage)
   variables:

builders/macos-python-builder.psm1

@@ -22,6 +22,13 @@ class macOSPythonBuilder : NixPythonBuilder {
         [string] $platform
     ) : Base($version, $architecture, $platform) { }
 
+    [void] PrepareEnvironment() {
+        <#
+        .SYNOPSIS
+        Prepare system environment by installing dependencies and required packages.
+        #>
+    }
+
     [void] Configure() {
         <#
         .SYNOPSIS
@@ -40,8 +47,8 @@ class macOSPythonBuilder : NixPythonBuilder {
         ### and then add the appropriate paths for the header and library files to configure command.
         ### Link to documentation (https://cpython-devguide.readthedocs.io/setup/#build-dependencies)
         if ($this.Version -lt "3.7.0") {
-            $env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib"
+            $env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib -L/usr/local/opt/zlib/lib"
-            $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include"
+            $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/zlib/include"
         } else {
             $configureString += " --with-openssl=/usr/local/opt/openssl@1.1"
         }
@@ -57,15 +64,4 @@ class macOSPythonBuilder : NixPythonBuilder {
 
         Execute-Command -Command $configureString
     }
-
-    [void] PrepareEnvironment() {
-        <#
-        .SYNOPSIS
-        Prepare system environment by installing dependencies and required packages.
-        #>
-
-        ### reinstall header files to Avoid issue with X11 headers on Mojave
-        $pkgName = "/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg"
-        Execute-Command -Command "sudo installer -pkg $pkgName -target /"
-    }
 }

tests/python-tests.ps1

@@ -47,7 +47,7 @@ Describe "Tests" {
         "python ./sources/simple-test.py" | Should -ReturnZeroExitCode
     }
 
-    if ($Version -ge "3.2.0") {
+    if (($Version -ge "3.2.0") -and ($Version -ne "3.11.0-alpha.3")) {
         It "Check if sqlite3 module is installed" {
             "python ./sources/python-sqlite3.py" | Should -ReturnZeroExitCode
         }

versions-manifest.json

@@ -77,6 +77,39 @@
       }
     ]
   },
+  {
+    "version": "3.10.1",
+    "stable": true,
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.10.1-120279",
+    "files": [
+      {
+        "filename": "python-3.10.1-linux-18.04-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "platform_version": "18.04",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.10.1-120279/python-3.10.1-linux-18.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.10.1-linux-20.04-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "platform_version": "20.04",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.10.1-120279/python-3.10.1-linux-20.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.10.1-win32-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.10.1-120279/python-3.10.1-win32-x64.zip"
+      },
+      {
+        "filename": "python-3.10.1-win32-x86.zip",
+        "arch": "x86",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.10.1-120279/python-3.10.1-win32-x86.zip"
+      }
+    ]
+  },
   {
     "version": "3.10.0",
     "stable": true,
@@ -693,6 +726,45 @@
       }
     ]
   },
+  {
+    "version": "3.9.9",
+    "stable": true,
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.9.9-119268",
+    "files": [
+      {
+        "filename": "python-3.9.9-darwin-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.9-119268/python-3.9.9-darwin-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.9-linux-18.04-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "platform_version": "18.04",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.9-119268/python-3.9.9-linux-18.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.9-linux-20.04-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "platform_version": "20.04",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.9-119268/python-3.9.9-linux-20.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.9-win32-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.9-119268/python-3.9.9-win32-x64.zip"
+      },
+      {
+        "filename": "python-3.9.9-win32-x86.zip",
+        "arch": "x86",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.9-119268/python-3.9.9-win32-x86.zip"
+      }
+    ]
+  },
   {
     "version": "3.9.8",
     "stable": true,