From 71129be509ed4f2a73909c1f96c45e3d6ab93a21 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 7 Feb 2023 10:39:57 +0100 Subject: [PATCH] Add support for 3.7.3 python version (#219) --- builders/macos-python-builder.psm1 | 8 ++++++++ tests/python-tests.ps1 | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1 index f31d38c..089f2e7 100644 --- a/builders/macos-python-builder.psm1 +++ b/builders/macos-python-builder.psm1 @@ -64,6 +64,14 @@ class macOSPythonBuilder : NixPythonBuilder { $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/zlib/include" } else { $configureString += " --with-openssl=/usr/local/opt/openssl@1.1" + + # For Python 3.7.2 and 3.7.3 we need to provide PATH for zlib to pack it properly. Otherwise the build will fail + # with the error: zipimport.ZipImportError: can't decompress data; zlib not available + if ($this.Version -eq "3.7.2" -or $this.Version -eq "3.7.3") { + $env:LDFLAGS = "-L/usr/local/opt/zlib/lib" + $env:CFLAGS = "-I/usr/local/opt/zlib/include" + } + if ($this.Version -gt "3.7.12") { $configureString += " --with-tcltk-includes='-I /usr/local/opt/tcl-tk/include' --with-tcltk-libs='-L/usr/local/opt/tcl-tk/lib -ltcl8.6 -ltk8.6'" } diff --git a/tests/python-tests.ps1 b/tests/python-tests.ps1 index 8f9dcaa..8ef4eb2 100644 --- a/tests/python-tests.ps1 +++ b/tests/python-tests.ps1 @@ -93,7 +93,8 @@ Describe "Tests" { It "Validate Pyinstaller" { "pip install pyinstaller" | Should -ReturnZeroExitCode "pyinstaller --onefile ./sources/simple-test.py" | Should -ReturnZeroExitCode - "./dist/simple-test" | Should -ReturnZeroExitCode + $distPath = [IO.Path]::Combine($pwd, "dist", "simple-test") + "$distPath" | Should -ReturnZeroExitCode } }