actions
/
python-versions
mirror of https://github.com/actions/python-versions.git
3
0
Fork 0
Code Actions 5 Packages Releases Activity

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

Change version of openssl for python building.
This commit is contained in:
MaksimZhukov 2020-10-28 15:17:45 +03:00 committed by GitHub
parent 57bf4da3a5 50e47adc8b
commit 0b6a06284d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builders/macos-python-builder.psm1
View File

@ -40,10 +40,10 @@ class macOSPythonBuilder : NixPythonBuilder {
### and then add the appropriate paths for the header and library files to configure command. ### 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) ### Link to documentation (https://cpython-devguide.readthedocs.io/setup/#build-dependencies)
if ($this.Version -lt "3.7.0") { 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 { } 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.* ### Compile with support of loadable sqlite extensions. Unavailable for Python 2.*

5
tests/python-tests.ps1
View File

@ -48,6 +48,11 @@ Describe "Tests" {
} }
} }
It "Run pip" {
"pip install requests" | Should -ReturnZeroExitCode
"pip uninstall requests -y" | Should -ReturnZeroExitCode
}
if (IsNixPlatform $Platform) { if (IsNixPlatform $Platform) {
It "Check for failed modules in build_output" { It "Check for failed modules in build_output" {

4
tests/sources/python-config-test.py
View File

@ -51,8 +51,8 @@ if os_type == 'Darwin':
print('Invalid ldflags: %s; Expected: %s' % (ldflags, expected_ldflags)) print('Invalid ldflags: %s; Expected: %s' % (ldflags, expected_ldflags))
exit(1) exit(1)
else: 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_includes = sysconfig.get_config_var('OPENSSL_INCLUDES')
openssl_ldflags = sysconfig.get_config_var('OPENSSL_LDFLAGS') openssl_ldflags = sysconfig.get_config_var('OPENSSL_LDFLAGS')

1
tests/sources/python-modules.py
View File

@ -139,6 +139,7 @@ standard_library = [
'sre_constants', 'sre_constants',
'sre_parse', 'sre_parse',
'ssl', 'ssl',
'_ssl',
'stat', 'stat',
'string', 'string',
'stringprep', 'stringprep',