From 99eefedac848029a1bcd326de2d7fe7835b2c41c Mon Sep 17 00:00:00 2001 From: James Douglass Date: Tue, 10 Sep 2024 09:48:08 -0700 Subject: [PATCH 1/4] Uncommenting the pyinstaller version cap RE:#1622 --- constraints_tests.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/constraints_tests.txt b/constraints_tests.txt index 92920cea3..dad2f088c 100644 --- a/constraints_tests.txt +++ b/constraints_tests.txt @@ -8,3 +8,8 @@ GDAL!=3.6.*,!=3.7.* # https://github.com/natcap/pygeoprocessing/issues/387 GDAL<3.8.5 + +# Pyinstaller 6.10 breaks our windows builds. Until we can figure out the +root cause, let's cap the versions to those that work. +# https://github.com/natcap/invest/issues/1622 +pyinstaller<6.10 From 9eb8c88f4a749135f89d77b58e2f7855204e2f5f Mon Sep 17 00:00:00 2001 From: James Douglass Date: Tue, 10 Sep 2024 10:02:39 -0700 Subject: [PATCH 2/4] Forgot to comment out a comment. RE:#1622 --- constraints_tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints_tests.txt b/constraints_tests.txt index dad2f088c..447311d58 100644 --- a/constraints_tests.txt +++ b/constraints_tests.txt @@ -10,6 +10,6 @@ GDAL!=3.6.*,!=3.7.* GDAL<3.8.5 # Pyinstaller 6.10 breaks our windows builds. Until we can figure out the -root cause, let's cap the versions to those that work. +# root cause, let's cap the versions to those that work. # https://github.com/natcap/invest/issues/1622 pyinstaller<6.10 From 6bd3d0e7d3be99471b533dcaefda6261915793eb Mon Sep 17 00:00:00 2001 From: James Douglass Date: Tue, 10 Sep 2024 10:24:22 -0700 Subject: [PATCH 3/4] Adding a missing hidden import on mac osx. RE:#1622 --- exe/invest.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/exe/invest.spec b/exe/invest.spec index ac4ec440b..e1d9c8907 100644 --- a/exe/invest.spec +++ b/exe/invest.spec @@ -30,7 +30,8 @@ kwargs = { 'pkg_resources.py2_warn', 'cmath', 'charset_normalizer', - 'scipy.special._cdflib' + 'scipy.special._cdflib', + 'scipy.special._special_ufuncs', ], 'datas': [proj_datas], 'cipher': block_cipher, From 948806c2bd9bd9f4dd151ab2f480a4ce7412215d Mon Sep 17 00:00:00 2001 From: James Douglass Date: Tue, 10 Sep 2024 10:49:57 -0700 Subject: [PATCH 4/4] Adding another hidden import. RE:#1622 --- exe/invest.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/exe/invest.spec b/exe/invest.spec index e1d9c8907..b0f3085ec 100644 --- a/exe/invest.spec +++ b/exe/invest.spec @@ -32,6 +32,7 @@ kwargs = { 'charset_normalizer', 'scipy.special._cdflib', 'scipy.special._special_ufuncs', + 'scipy._lib.array_api_compat.numpy.fft', ], 'datas': [proj_datas], 'cipher': block_cipher,