diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1 index 228aba3..7041fcc 100644 --- a/builders/macos-python-builder.psm1 +++ b/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:CFLAGS = "-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" + $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..1e340b7 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 -y" | 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',