From aa8915507ab1372df8926411042b8c0eea9fffa1 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 20 Oct 2020 13:12:41 +0300 Subject: [PATCH 1/7] add new openssl --- builders/macos-python-builder.psm1 | 3 ++- tests/python-tests.ps1 | 5 +++++ tests/sources/python-config-test.py | 4 ++-- tests/sources/python-modules.py | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1 index 228aba3..4bd1691 100644 --- a/builders/macos-python-builder.psm1 +++ b/builders/macos-python-builder.psm1 @@ -39,11 +39,12 @@ class macOSPythonBuilder : NixPythonBuilder { ### Solution is to install these libraries from a third-party package manager, ### 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) + Write-Host "openssl path: $(brew --prefix openssl)" if ($this.Version -lt "3.7.0") { $env:LDFLAGS = "-L$(brew --prefix openssl)/lib" $env:CFLAGS = "-I$(brew --prefix openssl)/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.* diff --git a/tests/python-tests.ps1 b/tests/python-tests.ps1 index d3b12eb..a3e6547 100644 --- a/tests/python-tests.ps1 +++ b/tests/python-tests.ps1 @@ -48,6 +48,11 @@ Describe "Tests" { } } + It "Run pip" { + "pip install requests" | Should -ReturnZeroExitCode + "pip uninstall requests" | Should -ReturnZeroExitCode + } + if (IsNixPlatform $Platform) { It "Check for failed modules in build_output" { diff --git a/tests/sources/python-config-test.py b/tests/sources/python-config-test.py index 314463f..b7c13d5 100644 --- a/tests/sources/python-config-test.py +++ b/tests/sources/python-config-test.py @@ -51,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_ldflags ='-L/usr/local/opt/openssl/lib' + expected_openssl_includes = '-I/usr/local/opt/openssl@1.1/include' + 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') diff --git a/tests/sources/python-modules.py b/tests/sources/python-modules.py index e00b66f..674d773 100644 --- a/tests/sources/python-modules.py +++ b/tests/sources/python-modules.py @@ -139,6 +139,7 @@ standard_library = [ 'sre_constants', 'sre_parse', 'ssl', + '_ssl', 'stat', 'string', 'stringprep', From 13b26039fab4890f590b5bb22b14b0d7f9c6f891 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 20 Oct 2020 15:47:44 +0300 Subject: [PATCH 2/7] add fix to confirm uninstalling --- tests/python-tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python-tests.ps1 b/tests/python-tests.ps1 index a3e6547..1e340b7 100644 --- a/tests/python-tests.ps1 +++ b/tests/python-tests.ps1 @@ -50,7 +50,7 @@ Describe "Tests" { It "Run pip" { "pip install requests" | Should -ReturnZeroExitCode - "pip uninstall requests" | Should -ReturnZeroExitCode + "pip uninstall requests -y" | Should -ReturnZeroExitCode } if (IsNixPlatform $Platform) { From 2aa5c75cf9a30a693f903b26958721d4a249c78e Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 21 Oct 2020 10:58:28 +0300 Subject: [PATCH 3/7] change connection --- azure-pipelines/templates/publish-release-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/templates/publish-release-steps.yml b/azure-pipelines/templates/publish-release-steps.yml index cbb041a..fd428c5 100644 --- a/azure-pipelines/templates/publish-release-steps.yml +++ b/azure-pipelines/templates/publish-release-steps.yml @@ -25,7 +25,7 @@ steps: - task: GitHubRelease@1 displayName: 'Upload release assets' inputs: - gitHubConnection: 'Github Connection' + gitHubConnection: 'GithubConnectionDSH' action: edit tag: '$(VERSION)-$(Build.BuildId)' title: '$(VERSION)' From cdd1351989cc0e7135a021be35baf7bafd401126 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 21 Oct 2020 15:55:45 +0300 Subject: [PATCH 4/7] change to static path --- builders/macos-python-builder.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1 index 4bd1691..a9568e7 100644 --- a/builders/macos-python-builder.psm1 +++ b/builders/macos-python-builder.psm1 @@ -41,8 +41,8 @@ class macOSPythonBuilder : NixPythonBuilder { ### Link to documentation (https://cpython-devguide.readthedocs.io/setup/#build-dependencies) Write-Host "openssl path: $(brew --prefix openssl)" if ($this.Version -lt "3.7.0") { - $env:LDFLAGS = "-L$(brew --prefix openssl)/lib" - $env:CFLAGS = "-I$(brew --prefix openssl)/include" + $env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib" #"-L$(brew --prefix openssl)/lib" + $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include" #"-I$(brew --prefix openssl)/include" } else { $configureString += " --with-openssl=/usr/local/opt/openssl@1.1" } From a7aea91c95cb2b48ebfdfd27ac71414a776bf398 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 21 Oct 2020 19:18:35 +0300 Subject: [PATCH 5/7] change links --- versions-manifest.json | 178 +++++------------------------------------ 1 file changed, 21 insertions(+), 157 deletions(-) diff --git a/versions-manifest.json b/versions-manifest.json index 9d00d25..f8ad073 100644 --- a/versions-manifest.json +++ b/versions-manifest.json @@ -48,46 +48,46 @@ { "version": "3.9.0", "stable": true, - "release_url": "https://github.com/actions/python-versions/releases/tag/3.9.0-83838", + "release_url": "https://github.com/dmitry-shibanov/python-versions/releases/tag/3.9.0-1176554", "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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/python-3.9.0-win32-x86.zip" } ] }, @@ -278,46 +278,46 @@ { "version": "3.8.6", "stable": true, - "release_url": "https://github.com/actions/python-versions/releases/tag/3.8.6-82502", + "release_url": "https://github.com/dmitry-shibanov/python-versions/releases/tag/3.8.6-1175600", "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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/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" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/python-3.8.6-win32-x86.zip" } ] }, @@ -827,185 +827,49 @@ } ] }, - { - "version": "3.6.12", - "stable": true, - "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.12-20200818.3", - "files": [ - { - "filename": "python-3.6.12-darwin-x64.tar.gz", - "arch": "x64", - "platform": "darwin", - "download_url": "https://github.com/actions/python-versions/releases/download/3.6.12-20200818.3/python-3.6.12-darwin-x64.tar.gz" - }, - { - "filename": "python-3.6.12-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.6.12-20200818.3/python-3.6.12-linux-16.04-x64.tar.gz" - }, - { - "filename": "python-3.6.12-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.6.12-20200818.3/python-3.6.12-linux-18.04-x64.tar.gz" - }, - { - "filename": "python-3.6.12-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.6.12-20200818.3/python-3.6.12-linux-20.04-x64.tar.gz" - } - ] - }, - { - "version": "3.6.11", - "stable": true, - "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.11-20200629.6", - "files": [ - { - "filename": "python-3.6.11-darwin-x64.tar.gz", - "arch": "x64", - "platform": "darwin", - "download_url": "https://github.com/actions/python-versions/releases/download/3.6.11-20200629.6/python-3.6.11-darwin-x64.tar.gz" - }, - { - "filename": "python-3.6.11-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.6.11-20200629.6/python-3.6.11-linux-16.04-x64.tar.gz" - }, - { - "filename": "python-3.6.11-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.6.11-20200629.6/python-3.6.11-linux-18.04-x64.tar.gz" - }, - { - "filename": "python-3.6.11-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.6.11-20200629.6/python-3.6.11-linux-20.04-x64.tar.gz" - } - ] - }, - { - "version": "3.6.10", - "stable": true, - "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.10-20200609.6", - "files": [ - { - "filename": "python-3.6.10-darwin-x64.tar.gz", - "arch": "x64", - "platform": "darwin", - "download_url": "https://github.com/actions/python-versions/releases/download/3.6.10-20200609.6/python-3.6.10-darwin-x64.tar.gz" - }, - { - "filename": "python-3.6.10-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.6.10-20200609.6/python-3.6.10-linux-16.04-x64.tar.gz" - }, - { - "filename": "python-3.6.10-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.6.10-20200609.6/python-3.6.10-linux-18.04-x64.tar.gz" - }, - { - "filename": "python-3.6.10-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.6.10-20200609.6/python-3.6.10-linux-20.04-x64.tar.gz" - } - ] - }, - { - "version": "3.6.9", - "stable": true, - "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.9-20200610.1", - "files": [ - { - "filename": "python-3.6.9-darwin-x64.tar.gz", - "arch": "x64", - "platform": "darwin", - "download_url": "https://github.com/actions/python-versions/releases/download/3.6.9-20200610.1/python-3.6.9-darwin-x64.tar.gz" - }, - { - "filename": "python-3.6.9-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.6.9-20200610.1/python-3.6.9-linux-16.04-x64.tar.gz" - }, - { - "filename": "python-3.6.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.6.9-20200610.1/python-3.6.9-linux-18.04-x64.tar.gz" - }, - { - "filename": "python-3.6.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.6.9-20200610.1/python-3.6.9-linux-20.04-x64.tar.gz" - } - ] - }, { "version": "3.6.8", "stable": true, - "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.8-20200609.13", + "release_url": "https://github.com/dmitry-shibanov/python-versions/releases/tag/3.6.8-1176758", "files": [ { "filename": "python-3.6.8-darwin-x64.tar.gz", "arch": "x64", "platform": "darwin", - "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-darwin-x64.tar.gz" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-darwin-x64.tar.gz" }, { "filename": "python-3.6.8-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.6.8-20200609.13/python-3.6.8-linux-16.04-x64.tar.gz" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-linux-16.04-x64.tar.gz" }, { "filename": "python-3.6.8-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.6.8-20200609.13/python-3.6.8-linux-18.04-x64.tar.gz" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-linux-18.04-x64.tar.gz" }, { "filename": "python-3.6.8-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.6.8-20200609.13/python-3.6.8-linux-20.04-x64.tar.gz" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-linux-20.04-x64.tar.gz" }, { "filename": "python-3.6.8-win32-x64.zip", "arch": "x64", "platform": "win32", - "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-win32-x64.zip" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-win32-x64.zip" }, { "filename": "python-3.6.8-win32-x86.zip", "arch": "x86", "platform": "win32", - "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-win32-x86.zip" + "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-win32-x86.zip" } ] }, From 99a84463ad5127117f0c568306f14791fa6c6e54 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 27 Oct 2020 11:45:49 +0300 Subject: [PATCH 6/7] revert test changes --- .../templates/publish-release-steps.yml | 2 +- builders/macos-python-builder.psm1 | 4 +- versions-manifest.json | 180 +++++++++++++++--- 3 files changed, 161 insertions(+), 25 deletions(-) diff --git a/azure-pipelines/templates/publish-release-steps.yml b/azure-pipelines/templates/publish-release-steps.yml index fd428c5..cbb041a 100644 --- a/azure-pipelines/templates/publish-release-steps.yml +++ b/azure-pipelines/templates/publish-release-steps.yml @@ -25,7 +25,7 @@ steps: - task: GitHubRelease@1 displayName: 'Upload release assets' inputs: - gitHubConnection: 'GithubConnectionDSH' + gitHubConnection: 'Github Connection' action: edit tag: '$(VERSION)-$(Build.BuildId)' title: '$(VERSION)' diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1 index a9568e7..3324262 100644 --- a/builders/macos-python-builder.psm1 +++ b/builders/macos-python-builder.psm1 @@ -41,8 +41,8 @@ class macOSPythonBuilder : NixPythonBuilder { ### Link to documentation (https://cpython-devguide.readthedocs.io/setup/#build-dependencies) Write-Host "openssl path: $(brew --prefix openssl)" if ($this.Version -lt "3.7.0") { - $env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib" #"-L$(brew --prefix openssl)/lib" - $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include" #"-I$(brew --prefix openssl)/include" + $env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib" + $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include" } else { $configureString += " --with-openssl=/usr/local/opt/openssl@1.1" } diff --git a/versions-manifest.json b/versions-manifest.json index f8ad073..87f4ca6 100644 --- a/versions-manifest.json +++ b/versions-manifest.json @@ -48,46 +48,46 @@ { "version": "3.9.0", "stable": true, - "release_url": "https://github.com/dmitry-shibanov/python-versions/releases/tag/3.9.0-1176554", + "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/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/python-3.9.0-darwin-x64.tar.gz" + "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/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/python-3.9.0-linux-16.04-x64.tar.gz" + "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/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/python-3.9.0-linux-18.04-x64.tar.gz" + "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/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/python-3.9.0-linux-20.04-x64.tar.gz" + "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/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/python-3.9.0-win32-x64.zip" + "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/dmitry-shibanov/python-versions/releases/download/3.9.0-1176554/python-3.9.0-win32-x86.zip" + "download_url": "https://github.com/actions/python-versions/releases/download/3.9.0-83838/python-3.9.0-win32-x86.zip" } ] }, @@ -278,46 +278,46 @@ { "version": "3.8.6", "stable": true, - "release_url": "https://github.com/dmitry-shibanov/python-versions/releases/tag/3.8.6-1175600", + "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/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/python-3.8.6-darwin-x64.tar.gz" + "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/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/python-3.8.6-linux-16.04-x64.tar.gz" + "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/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/python-3.8.6-linux-18.04-x64.tar.gz" + "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/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/python-3.8.6-linux-20.04-x64.tar.gz" + "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/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/python-3.8.6-win32-x64.zip" + "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/dmitry-shibanov/python-versions/releases/download/3.8.6-1175600/python-3.8.6-win32-x86.zip" + "download_url": "https://github.com/actions/python-versions/releases/download/3.8.6-82502/python-3.8.6-win32-x86.zip" } ] }, @@ -827,49 +827,185 @@ } ] }, + { + "version": "3.6.12", + "stable": true, + "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.12-20200818.3", + "files": [ + { + "filename": "python-3.6.12-darwin-x64.tar.gz", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.12-20200818.3/python-3.6.12-darwin-x64.tar.gz" + }, + { + "filename": "python-3.6.12-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.6.12-20200818.3/python-3.6.12-linux-16.04-x64.tar.gz" + }, + { + "filename": "python-3.6.12-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.6.12-20200818.3/python-3.6.12-linux-18.04-x64.tar.gz" + }, + { + "filename": "python-3.6.12-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.6.12-20200818.3/python-3.6.12-linux-20.04-x64.tar.gz" + } + ] + }, + { + "version": "3.6.11", + "stable": true, + "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.11-20200629.6", + "files": [ + { + "filename": "python-3.6.11-darwin-x64.tar.gz", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.11-20200629.6/python-3.6.11-darwin-x64.tar.gz" + }, + { + "filename": "python-3.6.11-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.6.11-20200629.6/python-3.6.11-linux-16.04-x64.tar.gz" + }, + { + "filename": "python-3.6.11-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.6.11-20200629.6/python-3.6.11-linux-18.04-x64.tar.gz" + }, + { + "filename": "python-3.6.11-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.6.11-20200629.6/python-3.6.11-linux-20.04-x64.tar.gz" + } + ] + }, + { + "version": "3.6.10", + "stable": true, + "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.10-20200609.6", + "files": [ + { + "filename": "python-3.6.10-darwin-x64.tar.gz", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.10-20200609.6/python-3.6.10-darwin-x64.tar.gz" + }, + { + "filename": "python-3.6.10-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.6.10-20200609.6/python-3.6.10-linux-16.04-x64.tar.gz" + }, + { + "filename": "python-3.6.10-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.6.10-20200609.6/python-3.6.10-linux-18.04-x64.tar.gz" + }, + { + "filename": "python-3.6.10-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.6.10-20200609.6/python-3.6.10-linux-20.04-x64.tar.gz" + } + ] + }, + { + "version": "3.6.9", + "stable": true, + "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.9-20200610.1", + "files": [ + { + "filename": "python-3.6.9-darwin-x64.tar.gz", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.9-20200610.1/python-3.6.9-darwin-x64.tar.gz" + }, + { + "filename": "python-3.6.9-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.6.9-20200610.1/python-3.6.9-linux-16.04-x64.tar.gz" + }, + { + "filename": "python-3.6.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.6.9-20200610.1/python-3.6.9-linux-18.04-x64.tar.gz" + }, + { + "filename": "python-3.6.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.6.9-20200610.1/python-3.6.9-linux-20.04-x64.tar.gz" + } + ] + }, { "version": "3.6.8", "stable": true, - "release_url": "https://github.com/dmitry-shibanov/python-versions/releases/tag/3.6.8-1176758", + "release_url": "https://github.com/actions/python-versions/releases/tag/3.6.8-20200609.13", "files": [ { "filename": "python-3.6.8-darwin-x64.tar.gz", "arch": "x64", "platform": "darwin", - "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-darwin-x64.tar.gz" + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-darwin-x64.tar.gz" }, { "filename": "python-3.6.8-linux-16.04-x64.tar.gz", "arch": "x64", "platform": "linux", "platform_version": "16.04", - "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-linux-16.04-x64.tar.gz" + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-linux-16.04-x64.tar.gz" }, { "filename": "python-3.6.8-linux-18.04-x64.tar.gz", "arch": "x64", "platform": "linux", "platform_version": "18.04", - "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-linux-18.04-x64.tar.gz" + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-linux-18.04-x64.tar.gz" }, { "filename": "python-3.6.8-linux-20.04-x64.tar.gz", "arch": "x64", "platform": "linux", "platform_version": "20.04", - "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-linux-20.04-x64.tar.gz" + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-linux-20.04-x64.tar.gz" }, { "filename": "python-3.6.8-win32-x64.zip", "arch": "x64", "platform": "win32", - "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-win32-x64.zip" + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-win32-x64.zip" }, { "filename": "python-3.6.8-win32-x86.zip", "arch": "x86", "platform": "win32", - "download_url": "https://github.com/dmitry-shibanov/python-versions/releases/download/3.6.8-1176758/python-3.6.8-win32-x86.zip" + "download_url": "https://github.com/actions/python-versions/releases/download/3.6.8-20200609.13/python-3.6.8-win32-x86.zip" } ] }, @@ -1153,4 +1289,4 @@ } ] } -] +] \ No newline at end of file From 50e47adc8bf811de73ff25e27a0cbba949ba4b4a Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 27 Oct 2020 11:56:49 +0300 Subject: [PATCH 7/7] remove debug lines --- builders/macos-python-builder.psm1 | 1 - versions-manifest.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1 index 3324262..7041fcc 100644 --- a/builders/macos-python-builder.psm1 +++ b/builders/macos-python-builder.psm1 @@ -39,7 +39,6 @@ class macOSPythonBuilder : NixPythonBuilder { ### Solution is to install these libraries from a third-party package manager, ### 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) - Write-Host "openssl path: $(brew --prefix openssl)" if ($this.Version -lt "3.7.0") { $env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib" $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include" diff --git a/versions-manifest.json b/versions-manifest.json index 87f4ca6..9d00d25 100644 --- a/versions-manifest.json +++ b/versions-manifest.json @@ -1289,4 +1289,4 @@ } ] } -] \ No newline at end of file +]