From 1ad1fa4bea2963c0b4f231dce44964fbd4313a84 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Wed, 6 Nov 2024 09:45:03 +0100 Subject: [PATCH 01/13] cast to integer --- dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.py b/dependencies.py index 6d9c2e78..a1d9e56d 100644 --- a/dependencies.py +++ b/dependencies.py @@ -524,7 +524,7 @@ def _install_dependencies(dependencies, target_dir): # sticking around. if bar: - bar.setValue((count / len(dependencies)) * 100) + bar.setValue(int((count / len(dependencies)) * 100)) bar.update() QApplication.processEvents() From 7a5e4845f135c8c7f71dcbc22d35f309c0b57796 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Wed, 6 Nov 2024 09:45:24 +0100 Subject: [PATCH 02/13] add wheels support for python 3.12 --- external-dependencies/populate.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/external-dependencies/populate.sh b/external-dependencies/populate.sh index 44726778..06c705fd 100755 --- a/external-dependencies/populate.sh +++ b/external-dependencies/populate.sh @@ -64,21 +64,28 @@ cp h5py/h5py-2.10.0-cp39-cp39-win_amd64.whl . # Copy pure wheels to prevent pip in docker (or Windows) to select platform dependent version wget https://files.pythonhosted.org/packages/cd/84/66072ee12c3e79061f183c09a24be24f45bb1286600589640363d9d416b0/SQLAlchemy-2.0.6-py3-none-any.whl#sha256=c5d754665edea1ecdc79e3023659cb5594372e10776f3b3734d75c2c3ce95013 -# Download windows wheels (cp39, win, amd64) +# Download windows wheels (cp39, cp312, win, amd64) wget https://files.pythonhosted.org/packages/b2/8e/83d9e3bff5c0ff7a0ec7e850c785916e616ab20d8793943f9e1d2a987fab/shapely-2.0.0-cp39-cp39-win_amd64.whl +wget https://files.pythonhosted.org/packages/7b/b3/857afd9dfbfc554f10d683ac412eac6fa260d1f4cd2967ecb655c57e831a/shapely-2.0.6-cp312-cp312-win_amd64.whl wget https://files.pythonhosted.org/packages/75/b7/7849ad6f25e17f72f4c7e411b36b456205db2c501ad495bfc97c1cd3b813/threedigrid_builder-1.14.4-cp39-cp39-win_amd64.whl +wget https://files.pythonhosted.org/packages/6c/d8/e3d88ad1c2e46562585565f241dba53c089d9d7ab45aa20f51d14a01ee09/threedigrid_builder-1.14.4-cp312-cp312-win_amd64.whl +wget https://files.pythonhosted.org/packages/43/21/a5d9df1d21514883333fc86584c07c2b49ba7c602e670b174bd73cfc9c7f/greenlet-3.1.1-cp312-cp312-win_amd64.whl#sha256=7124e16b4c55d417577c2077be379514321916d5790fa287c9ed6f23bd2ffd01 wget https://files.pythonhosted.org/packages/b3/89/1d3b78577a6b2762cb254f6ce5faec9b7c7b23052d1cdb7237273ff37d10/greenlet-2.0.2-cp39-cp39-win_amd64.whl#sha256=db1a39669102a1d8d12b57de2bb7e2ec9066a6f2b3da35ae511ff93b01b5d564 wget https://files.pythonhosted.org/packages/5f/d6/5f59a5e5570c4414d94c6da4c97731deab832cbd14eaf23189d54a92d1e1/cftime-1.6.2-cp39-cp39-win_amd64.whl#sha256=86fe550b94525c327578a90b2e13418ca5ba6c636d5efe3edec310e631757eea +wget https://files.pythonhosted.org/packages/17/98/ba5b4a2f37c6c88454b696dd5c7a4e76fc8bfd014364b47ddd7e2cec0fcd/cftime-1.6.4-cp312-cp312-win_amd64.whl#sha256=5b5ad7559a16bedadb66af8e417b6805f758acb57aa38d2730844dfc63a1e667 - -# Download linux wheels (both cp38 and cp310) +# Download linux wheels (cp38, cp310, cp312) +wget https://files.pythonhosted.org/packages/d5/7d/9a57e187cbf2fbbbdfd4044a4f9ce141c8d221f9963750d3b001f0ec080d/shapely-2.0.6-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl wget https://files.pythonhosted.org/packages/06/07/0700e5e33c44bc87e19953244c29f73669cfb6f19868899170f9c7e34554/shapely-2.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl wget https://files.pythonhosted.org/packages/4e/03/f3bcb7d96aef6d56b62e2f25996f161c05f92a45d452165be2007b756e0f/shapely-2.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl wget https://files.pythonhosted.org/packages/0b/22/8868b2266baa2f8f9747100232807de4151fd720322ee5d5d724d6415d63/threedigrid_builder-1.14.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl wget https://files.pythonhosted.org/packages/bd/8c/db51b687ee80cf28787f7b862b62e77e096001513176252d824384d2739c/threedigrid_builder-1.14.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl +wget https://files.pythonhosted.org/packages/da/86/6603905deeed966584c7b8d1367c03034d4bc347e45dad9989f8a0576112/threedigrid_builder-1.14.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl +wget https://files.pythonhosted.org/packages/57/5c/7c6f50cb12be092e1dccb2599be5a942c3416dbcfb76efcf54b3f8be4d8d/greenlet-3.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=99cfaa2110534e2cf3ba31a7abcac9d328d1d9f1b95beede58294a60348fba36 wget https://files.pythonhosted.org/packages/6e/11/a1f1af20b6a1a8069bc75012569d030acb89fd7ef70f888b6af2f85accc6/greenlet-2.0.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=d75209eed723105f9596807495d58d10b3470fa6732dd6756595e89925ce2470 wget https://files.pythonhosted.org/packages/e1/17/d8042d82f44c08549b535bf2e7d1e87aa1863df5ed6cf1cf773eb2dfdf67/cftime-1.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=acb294fdb80e33545ae54b4421df35c4e578708a5ffce1c00408b2294e70ecef wget https://files.pythonhosted.org/packages/44/51/bc9d47beee47afda1d335f05efa848dc403bd183344f03d431281518e8ab/cftime-1.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl#sha256=7a820e16357dbdc9723b2059f7178451de626a8b2e5f80b9d91a77e3dac42133 +wget https://files.pythonhosted.org/packages/04/56/233d817ef571d778281f3d639049b342f6ff0bb4de4c5ee630befbd55319/cftime-1.6.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=f92f2e405eeda47b30ab6231d8b7d136a55f21034d394f93ade322d356948654 touch .generated.marker From 099fce42000c75fd0334d7d7e474a2cd64c03b67 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Wed, 6 Nov 2024 10:05:16 +0100 Subject: [PATCH 03/13] Update Changes --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 3dc51432..cb5aa4fd 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,7 @@ - Allow LinestringZ input by using WKB instead of WKT as conversion format (#1040) - Make "Use selected features" behaviour explicit (#1057) - Added animation settings (#1046) +- Compaitibility with Python 3.12 (#1061) 3.10.0 (2024-09-12) From 8660e8213fcb27eaee08452406f5866532259c28 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Wed, 6 Nov 2024 10:17:56 +0100 Subject: [PATCH 04/13] Spelling --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index cb5aa4fd..204d4b8b 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,7 +7,7 @@ - Allow LinestringZ input by using WKB instead of WKT as conversion format (#1040) - Make "Use selected features" behaviour explicit (#1057) - Added animation settings (#1046) -- Compaitibility with Python 3.12 (#1061) +- Compatibility with Python 3.12 (#1061) 3.10.0 (2024-09-12) From a46c51112cbddc9e9802ccaa5552307e9c508e7e Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Tue, 12 Nov 2024 15:42:31 +0100 Subject: [PATCH 05/13] bump h5py and scipy --- CHANGES.rst | 1 + dependencies.py | 4 ++-- external-dependencies/populate.sh | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 204d4b8b..b7d72ed3 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,7 @@ - Make "Use selected features" behaviour explicit (#1057) - Added animation settings (#1046) - Compatibility with Python 3.12 (#1061) +- Bumped h5py to 3.10.0 and scipy to 1.13.0 for python 3.12 compatibility (#1061) 3.10.0 (2024-09-12) diff --git a/dependencies.py b/dependencies.py index a1d9e56d..7f51bab0 100644 --- a/dependencies.py +++ b/dependencies.py @@ -87,12 +87,12 @@ H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==2.10.0", False) else: SUPPORTED_HDF5_VERSIONS = ["1.14.0"] - H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==3.8.0", True) + H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==3.10.0", True) WINDOWS_PLATFORM_DEPENDENCIES = [Dependency("scipy", "scipy", "==1.6.2", False)] if QGIS_VERSION >= 32811 and platform.system() == "Windows": WINDOWS_PLATFORM_DEPENDENCIES = [ - Dependency("scipy", "scipy", "==1.10.1", True), + Dependency("scipy", "scipy", "==1.13.0", True), ] # If you add a dependency, also adjust external-dependencies/populate.sh diff --git a/external-dependencies/populate.sh b/external-dependencies/populate.sh index 06c705fd..d70cbbaa 100755 --- a/external-dependencies/populate.sh +++ b/external-dependencies/populate.sh @@ -40,16 +40,16 @@ mkdir build cd build # Download the custom compiled qgis version tar of h5py, create a tar from the distro subfolder -wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-h5py/python3-h5py-3.8.0-1.tar.bz2 -tar -xvf python3-h5py-3.8.0-1.tar.bz2 -tar -cf h5py-3.8.0.tar -C ./apps/Python39/Lib/site-packages/ . -cp h5py-3.8.0.tar .. +wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-h5py/python3-h5py-3.10.0-1.tar.bz2 +tar -xvf python3-h5py-3.10.0-1.tar.bz2 +tar -cf h5py-3.10.0.tar -C ./apps/Python312/Lib/site-packages/ . +cp h5py-3.10.0.tar .. # as well as scipy -wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-scipy/python3-scipy-1.10.1-1.tar.bz2 -tar -xvf python3-scipy-1.10.1-1.tar.bz2 -tar -cf scipy-1.10.1.tar -C ./apps/Python39/Lib/site-packages/ . -cp scipy-1.10.1.tar .. +wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-scipy/python3-scipy-1.13.0-1.tar.bz2 +tar -xvf python3-scipy-1.13.0-1.tar.bz2 +tar -cf scipy-1.13.0.tar -C ./apps/Python312/Lib/site-packages/ . +cp scipy-1.13.0.tar .. # Back up a level and clean up the build/ directory. cd .. From 960ede3697b9433721cc796e2b0d283127f7e458 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Tue, 12 Nov 2024 15:45:59 +0100 Subject: [PATCH 06/13] update Changes --- CHANGES.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2a53ff7e..6ac19c35 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,8 @@ 3.12 (unreleased) ----------------- -- Nothing changed yet. +- Compatibility with Python 3.12 (#1061) +- Bumped h5py to 3.10.0 and scipy to 1.13.0 for python 3.12 compatibility (#1061) 3.11 (2024-11-12) @@ -13,8 +14,6 @@ - Allow LinestringZ input by using WKB instead of WKT as conversion format (#1040) - Make "Use selected features" behaviour explicit (#1057) - Added animation settings (#1046) -- Compatibility with Python 3.12 (#1061) -- Bumped h5py to 3.10.0 and scipy to 1.13.0 for python 3.12 compatibility (#1061) - Bump hydxlib to 1.5.3 From 64326ec8de8d51a19fadbcd2a871323e0e156991 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Fri, 29 Nov 2024 11:18:31 +0100 Subject: [PATCH 07/13] Update Changes --- CHANGES.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index efd4ea5c..15803755 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,7 +6,6 @@ - Compatibility with Python 3.12 (#1061) - Bumped h5py to 3.10.0 and scipy to 1.13.0 for python 3.12 compatibility (#1061) - - Fixed attributeError when loading a QGIS project (#1063) - Fix in Rasters to NetCDF algorithm to properly convert the units Enum to string (#1067) From f5d8ce4c368616fd73843f86025a0988ac3a0ba5 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Fri, 6 Dec 2024 14:10:08 +0100 Subject: [PATCH 08/13] Preparing release 3.11.1 --- CHANGES.rst | 4 ++-- Dockerfile | 10 +++++----- version.rst | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index bdd71396..0902110e 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,8 +1,8 @@ 3Di Results Analysis changelog ======================== -3.12 (unreleased) ------------------ +3.11.1 (2024-12-06) +------------------- - Compatibility with Python 3.12 (#1061) - Bumped h5py to 3.10.0 and scipy to 1.13.0 for python 3.12 compatibility (#1061) diff --git a/Dockerfile b/Dockerfile index 832cb5b0..6a928fb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -from qgis/qgis:final-3_28_4 +FROM qgis/qgis:3.40 RUN apt-get update && apt-get install -y python3-pyqt5.qtwebsockets wget python3-scipy python3-h5py zip && apt-get clean # RUN mkdir -p /tests_directory COPY requirements-dev.txt /root # coverage is already installed globally, so we need to force-install it explicitly -RUN pip3 install 'coverage>6.1.1,<7.0' --force -RUN pip3 install -r /root/requirements-dev.txt -RUN qgis_setup.sh +RUN pip3 install 'coverage>6.1.1,<7.0' --force --break-system-packages +RUN pip3 install -r /root/requirements-dev.txt --break-system-packages +# RUN qgis_setup.sh # Copied the original PYTHONPATH and added the profile's python dir to # imitate qgis' behaviour. -ENV PYTHONPATH /usr/share/qgis/python/:/usr/share/qgis/python/plugins:/usr/lib/python3/dist-packages/qgis:/usr/share/qgis/python/qgis:/root/.local/share/QGIS/QGIS3/profiles/default/python +ENV PYTHONPATH=/usr/share/qgis/python/:/usr/share/qgis/python/plugins:/usr/lib/python3/dist-packages/qgis:/usr/share/qgis/python/qgis:/root/.local/share/QGIS/QGIS3/profiles/default/python # Note: we'll mount the current dir into this WORKDIR WORKDIR /root/.local/share/QGIS/QGIS3/profiles/default/python/plugins/threedi_results_analysis diff --git a/version.rst b/version.rst index db7923e2..371cfe35 100644 --- a/version.rst +++ b/version.rst @@ -1 +1 @@ -3.12.dev0 +3.11.1 From 20450698a3b4bc47a6bd3af0f3ff8a7197da1624 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Fri, 6 Dec 2024 14:10:22 +0100 Subject: [PATCH 09/13] Back to development: 3.12 --- CHANGES.rst | 6 ++++++ version.rst | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0902110e..6c310cf9 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,12 @@ 3Di Results Analysis changelog ======================== +3.12 (unreleased) +----------------- + +- Nothing changed yet. + + 3.11.1 (2024-12-06) ------------------- diff --git a/version.rst b/version.rst index 371cfe35..db7923e2 100644 --- a/version.rst +++ b/version.rst @@ -1 +1 @@ -3.11.1 +3.12.dev0 From 4924db191be7661baf79e8004e73f835bb85e965 Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Mon, 9 Dec 2024 12:12:32 +0100 Subject: [PATCH 10/13] revert changes made to the Dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a928fb9..d95ebd23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM qgis/qgis:3.40 +FROM qgis/qgis:final-3_28_4 RUN apt-get update && apt-get install -y python3-pyqt5.qtwebsockets wget python3-scipy python3-h5py zip && apt-get clean # RUN mkdir -p /tests_directory COPY requirements-dev.txt /root # coverage is already installed globally, so we need to force-install it explicitly -RUN pip3 install 'coverage>6.1.1,<7.0' --force --break-system-packages -RUN pip3 install -r /root/requirements-dev.txt --break-system-packages -# RUN qgis_setup.sh +RUN pip3 install 'coverage>6.1.1,<7.0' --force +RUN pip3 install -r /root/requirements-dev.txt +RUN qgis_setup.sh # Copied the original PYTHONPATH and added the profile's python dir to # imitate qgis' behaviour. From ab4030e1b7827f70ebf766c7c3ecf0d7647e56ec Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Mon, 9 Dec 2024 12:15:56 +0100 Subject: [PATCH 11/13] revert Changes --- CHANGES.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 6c310cf9..bdd71396 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,12 +4,6 @@ 3.12 (unreleased) ----------------- -- Nothing changed yet. - - -3.11.1 (2024-12-06) -------------------- - - Compatibility with Python 3.12 (#1061) - Bumped h5py to 3.10.0 and scipy to 1.13.0 for python 3.12 compatibility (#1061) - Added Processing Algorithm "Extract structure control actions" (#926) From c609c51630c457efab86f301165c23f49e8fdfae Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Tue, 10 Dec 2024 10:31:09 +0100 Subject: [PATCH 12/13] Support h5py for both python 3.9 and python 3.12 --- dependencies.py | 5 ++++- external-dependencies/populate.sh | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dependencies.py b/dependencies.py index dc0a0596..8c523fbc 100644 --- a/dependencies.py +++ b/dependencies.py @@ -85,9 +85,12 @@ if QGIS_VERSION < 32806 and platform.system() == "Windows": SUPPORTED_HDF5_VERSIONS = ["1.10.7"] H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==2.10.0", False) +elif QGIS_VERSION >= 34000 and platform.system() == "Windows": + SUPPORTED_HDF5_VERSIONS = ["1.14.0"] + H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==3.10.0", False) else: SUPPORTED_HDF5_VERSIONS = ["1.14.0"] - H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==3.10.0", True) + H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==3.8.0", True) WINDOWS_PLATFORM_DEPENDENCIES = [Dependency("scipy", "scipy", "==1.6.2", False)] if QGIS_VERSION >= 32811 and platform.system() == "Windows": diff --git a/external-dependencies/populate.sh b/external-dependencies/populate.sh index d70cbbaa..3f214977 100755 --- a/external-dependencies/populate.sh +++ b/external-dependencies/populate.sh @@ -40,6 +40,13 @@ mkdir build cd build # Download the custom compiled qgis version tar of h5py, create a tar from the distro subfolder +# Download h5py 3.8.0 for QGis versions before 3.40 +wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-h5py/python3-h5py-3.8.0-1.tar.bz2 +tar -xvf python3-h5py-3.8.0-1.tar.bz2 +tar -cf h5py-3.8.0.tar -C ./apps/Python39/Lib/site-packages/ . +cp h5py-3.8.0.tar .. + +# Download h5py 3.10.0 for QGis versions after 3.40 wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-h5py/python3-h5py-3.10.0-1.tar.bz2 tar -xvf python3-h5py-3.10.0-1.tar.bz2 tar -cf h5py-3.10.0.tar -C ./apps/Python312/Lib/site-packages/ . From 174854f1451f1eb9ed28f58a35b892d44ca0d70b Mon Sep 17 00:00:00 2001 From: Hoan Phung Date: Tue, 10 Dec 2024 10:54:26 +0100 Subject: [PATCH 13/13] Support scipy for both python 3.9 and 3.12 --- dependencies.py | 11 +++++++++-- external-dependencies/populate.sh | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dependencies.py b/dependencies.py index 8c523fbc..34ae9c96 100644 --- a/dependencies.py +++ b/dependencies.py @@ -92,11 +92,18 @@ SUPPORTED_HDF5_VERSIONS = ["1.14.0"] H5PY_DEPENDENCY = Dependency("h5py", "h5py", "==3.8.0", True) -WINDOWS_PLATFORM_DEPENDENCIES = [Dependency("scipy", "scipy", "==1.6.2", False)] -if QGIS_VERSION >= 32811 and platform.system() == "Windows": +if QGIS_VERSION < 32811 and platform.system() == "Windows": + WINDOWS_PLATFORM_DEPENDENCIES = [ + Dependency("scipy", "scipy", "==1.6.2", True), + ] +elif QGIS_VERSION >= 34000 and platform.system() == "Windows": WINDOWS_PLATFORM_DEPENDENCIES = [ Dependency("scipy", "scipy", "==1.13.0", True), ] +else: + WINDOWS_PLATFORM_DEPENDENCIES = [ + Dependency("scipy", "scipy", "==1.10.1", False), + ] # If you add a dependency, also adjust external-dependencies/populate.sh INTERESTING_IMPORTS = ["numpy", "osgeo", "pip", "setuptools"] diff --git a/external-dependencies/populate.sh b/external-dependencies/populate.sh index 3f214977..53f2576e 100755 --- a/external-dependencies/populate.sh +++ b/external-dependencies/populate.sh @@ -53,6 +53,13 @@ tar -cf h5py-3.10.0.tar -C ./apps/Python312/Lib/site-packages/ . cp h5py-3.10.0.tar .. # as well as scipy +# Download scipy 1.6.2 for QGis versions before 3.40 +wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-scipy/python3-scipy-1.10.1-1.tar.bz2 +tar -xvf python3-scipy-1.10.1-1.tar.bz2 +tar -cf scipy-1.10.1.tar -C ./apps/Python39/Lib/site-packages/ . +cp scipy-1.10.1.tar .. + +# Download scipy 1.13.0 for QGis versions after 3.40 wget http://download.osgeo.org/osgeo4w/v2/x86_64/release/python3/python3-scipy/python3-scipy-1.13.0-1.tar.bz2 tar -xvf python3-scipy-1.13.0-1.tar.bz2 tar -cf scipy-1.13.0.tar -C ./apps/Python312/Lib/site-packages/ .