Merge pull request #58 from dmitry-shibanov/v-dmshib/rebuild-python-openssl

Change version of openssl for python building.

builders/macos-python-builder.psm1

@@ -40,10 +40,10 @@ 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$(brew --prefix openssl)/lib"
+            $env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib"
-            $env:CFLAGS = "-I$(brew --prefix openssl)/include"
+            $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include"
         } else {
-            $configureString += " --with-openssl=/usr/local/opt/openssl"
+            $configureString += " --with-openssl=/usr/local/opt/openssl@1.1"
         }
 
         ### Compile with support of loadable sqlite extensions. Unavailable for Python 2.*

tests/python-tests.ps1

@@ -7,6 +7,7 @@ param (
 
 Import-Module (Join-Path $PSScriptRoot "../helpers/pester-extensions.psm1")
 Import-Module (Join-Path $PSScriptRoot "../helpers/common-helpers.psm1")
+Import-Module (Join-Path $PSScriptRoot "../builders/python-version.psm1")
 
 function Analyze-MissingModules([string] $buildOutputLocation) {
     $searchStringStart = "Failed to build these modules:"
@@ -47,6 +48,11 @@ Describe "Tests" {
         }
     }
 
+    It "Run pip" {
+        "pip install requests" | Should -ReturnZeroExitCode
+        "pip uninstall requests -y" | Should -ReturnZeroExitCode
+    }
+
     if (IsNixPlatform $Platform) {
 
         It "Check for failed modules in build_output" {
@@ -59,7 +65,8 @@ Describe "Tests" {
         }
 
         It "Check if python configuration is correct" {
-            "python ./sources/python-config-test.py $Version" | Should -ReturnZeroExitCode
+            $nativeVersion = Convert-Version -version $Version
+            "python ./sources/python-config-test.py $Version $nativeVersion" | Should -ReturnZeroExitCode
         }
 
         It "Check if shared libraries are linked correctly" {

tests/sources/python-config-test.py

@@ -1,4 +1,5 @@
 import distutils.sysconfig
+from distutils.version import StrictVersion
 import sysconfig
 import sys
 import platform
@@ -7,6 +8,7 @@ import os
 # Define variables
 os_type = platform.system()
 version = sys.argv[1]
+nativeVersion = sys.argv[2]
 
 lib_dir_path = sysconfig.get_config_var('LIBDIR')
 ld_library_name = sysconfig.get_config_var('LDLIBRARY')
@@ -41,7 +43,7 @@ else:
 ### Validate macOS
 if os_type == 'Darwin':
     ### Validate openssl links
-    if version < "3.7.0":
+    if StrictVersion(nativeVersion) < StrictVersion("3.7.0"):
         expected_ldflags = '-L/usr/local/opt/openssl@1.1/lib'
         ldflags = sysconfig.get_config_var('LDFLAGS')
 
@@ -49,8 +51,8 @@ if os_type == 'Darwin':
             print('Invalid ldflags: %s; Expected: %s' % (ldflags, expected_ldflags))
             exit(1)
     else:
-        expected_openssl_includes = '-I/usr/local/opt/openssl/include'
+        expected_openssl_includes = '-I/usr/local/opt/openssl@1.1/include'
-        expected_openssl_ldflags ='-L/usr/local/opt/openssl/lib'
+        expected_openssl_ldflags ='-L/usr/local/opt/openssl@1.1/lib'
         
         openssl_includes = sysconfig.get_config_var('OPENSSL_INCLUDES')
         openssl_ldflags = sysconfig.get_config_var('OPENSSL_LDFLAGS')

tests/sources/python-modules.py

@@ -139,6 +139,7 @@ standard_library = [
     'sre_constants',
     'sre_parse',
     'ssl',
+    '_ssl',
     'stat',
     'string',
     'stringprep',
@@ -255,6 +256,10 @@ if sys.version_info > (3, 7):
 if sys.version_info > (3, 8):
     standard_library.remove('dummy_threading')
 
+# 'symbol' module has been removed from Python 3.10
+if sys.version_info >= (3, 10):
+    standard_library.remove('symbol')
+
 # Remove tkinter and Easter eggs
 excluded_modules = [
     'antigravity',

versions-manifest.json

@@ -1,4 +1,142 @@
 [
+  {
+    "version": "3.10.0-alpha.1",
+    "stable": false,
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.10.0-alpha.1-84873",
+    "files": [
+      {
+        "filename": "python-3.10.0-alpha.1-darwin-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.10.0-alpha.1-84873/python-3.10.0-alpha.1-darwin-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.10.0-alpha.1-linux-16.04-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "platform_version": "16.04",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.10.0-alpha.1-84873/python-3.10.0-alpha.1-linux-16.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.10.0-alpha.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.0-alpha.1-84873/python-3.10.0-alpha.1-linux-18.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.10.0-alpha.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.0-alpha.1-84873/python-3.10.0-alpha.1-linux-20.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.10.0-alpha.1-win32-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.10.0-alpha.1-84873/python-3.10.0-alpha.1-win32-x64.zip"
+      },
+      {
+        "filename": "python-3.10.0-alpha.1-win32-x86.zip",
+        "arch": "x86",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.10.0-alpha.1-84873/python-3.10.0-alpha.1-win32-x86.zip"
+      }
+    ]
+  },
+  {
+    "version": "3.9.0",
+    "stable": true,
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.9.0-83838",
+    "files": [
+      {
+        "filename": "python-3.9.0-darwin-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-83838/python-3.9.0-darwin-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.0-linux-16.04-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "platform_version": "16.04",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-83838/python-3.9.0-linux-16.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.0-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.0-83838/python-3.9.0-linux-18.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.0-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.0-83838/python-3.9.0-linux-20.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.0-win32-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-83838/python-3.9.0-win32-x64.zip"
+      },
+      {
+        "filename": "python-3.9.0-win32-x86.zip",
+        "arch": "x86",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-83838/python-3.9.0-win32-x86.zip"
+      }
+    ]
+  },
+  {
+    "version": "3.9.0-rc.2",
+    "stable": false,
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.9.0-rc.2-82072",
+    "files": [
+      {
+        "filename": "python-3.9.0-rc.2-darwin-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-rc.2-82072/python-3.9.0-rc.2-darwin-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.0-rc.2-linux-16.04-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "platform_version": "16.04",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-rc.2-82072/python-3.9.0-rc.2-linux-16.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.0-rc.2-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.0-rc.2-82072/python-3.9.0-rc.2-linux-18.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.0-rc.2-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.0-rc.2-82072/python-3.9.0-rc.2-linux-20.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.9.0-rc.2-win32-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-rc.2-82072/python-3.9.0-rc.2-win32-x64.zip"
+      },
+      {
+        "filename": "python-3.9.0-rc.2-win32-x86.zip",
+        "arch": "x86",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-rc.2-82072/python-3.9.0-rc.2-win32-x86.zip"
+      }
+    ]
+  },
   {
     "version": "3.9.0-rc.1",
     "stable": false,
@@ -137,6 +275,52 @@
       }
     ]
   },
+  {
+    "version": "3.8.6",
+    "stable": true,
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.8.6-82502",
+    "files": [
+      {
+        "filename": "python-3.8.6-darwin-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.8.6-82502/python-3.8.6-darwin-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.8.6-linux-16.04-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "platform_version": "16.04",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.8.6-82502/python-3.8.6-linux-16.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.8.6-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.8.6-82502/python-3.8.6-linux-18.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.8.6-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.8.6-82502/python-3.8.6-linux-20.04-x64.tar.gz"
+      },
+      {
+        "filename": "python-3.8.6-win32-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.8.6-82502/python-3.8.6-win32-x64.zip"
+      },
+      {
+        "filename": "python-3.8.6-win32-x86.zip",
+        "arch": "x86",
+        "platform": "win32",
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.8.6-82502/python-3.8.6-win32-x86.zip"
+      }
+    ]
+  },
   {
     "version": "3.8.5",
     "stable": true,