Skip to content

Commit 0b6a062

Browse files
authored
Merge pull request actions#58 from dmitry-shibanov/v-dmshib/rebuild-python-openssl
Change version of openssl for python building.
2 parents 57bf4da + 50e47ad commit 0b6a062

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

builders/macos-python-builder.psm1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ class macOSPythonBuilder : NixPythonBuilder {
4040
### and then add the appropriate paths for the header and library files to configure command.
4141
### Link to documentation (https://cpython-devguide.readthedocs.io/setup/#build-dependencies)
4242
if ($this.Version -lt "3.7.0") {
43-
$env:LDFLAGS = "-L$(brew --prefix openssl)/lib"
44-
$env:CFLAGS = "-I$(brew --prefix openssl)/include"
43+
$env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib"
44+
$env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include"
4545
} else {
46-
$configureString += " --with-openssl=/usr/local/opt/openssl"
46+
$configureString += " --with-openssl=/usr/local/opt/openssl@1.1"
4747
}
4848

4949
### Compile with support of loadable sqlite extensions. Unavailable for Python 2.*

tests/python-tests.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ Describe "Tests" {
4848
}
4949
}
5050

51+
It "Run pip" {
52+
"pip install requests" | Should -ReturnZeroExitCode
53+
"pip uninstall requests -y" | Should -ReturnZeroExitCode
54+
}
55+
5156
if (IsNixPlatform $Platform) {
5257

5358
It "Check for failed modules in build_output" {

tests/sources/python-config-test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
print('Invalid ldflags: %s; Expected: %s' % (ldflags, expected_ldflags))
5252
exit(1)
5353
else:
54-
expected_openssl_includes = '-I/usr/local/opt/openssl/include'
55-
expected_openssl_ldflags ='-L/usr/local/opt/openssl/lib'
54+
expected_openssl_includes = '-I/usr/local/opt/openssl@1.1/include'
55+
expected_openssl_ldflags ='-L/usr/local/opt/openssl@1.1/lib'
5656

5757
openssl_includes = sysconfig.get_config_var('OPENSSL_INCLUDES')
5858
openssl_ldflags = sysconfig.get_config_var('OPENSSL_LDFLAGS')

tests/sources/python-modules.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
'sre_constants',
140140
'sre_parse',
141141
'ssl',
142+
'_ssl',
142143
'stat',
143144
'string',
144145
'stringprep',

0 commit comments

Comments
 (0)