From 66f657554235f8367664a00350d968c9f1b747e8 Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 12 Feb 2024 09:48:52 -0500 Subject: [PATCH 1/5] restrict scipy version. #1508 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5b2583b0fb..eb80fec071 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ pandas>=1.2.1 numpy>=1.11.0,!=1.16.0 Rtree>=0.8.2,!=0.9.1 shapely>=2.0.0 -scipy>=1.9.0 +scipy>=1.9.0,<1.12.0 pygeoprocessing>=2.4.2 # pip-only taskgraph>=0.11.0 psutil>=5.6.6 From 04df0bd4f4d60d88d8a4959ead1db3361489e698 Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 19 Feb 2024 09:13:28 -0500 Subject: [PATCH 2/5] scipy patch was applied and should be in included in 1.13.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index eb80fec071..cad4fa0e7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ pandas>=1.2.1 numpy>=1.11.0,!=1.16.0 Rtree>=0.8.2,!=0.9.1 shapely>=2.0.0 -scipy>=1.9.0,<1.12.0 +scipy>=1.9.0,!=1.12.* pygeoprocessing>=2.4.2 # pip-only taskgraph>=0.11.0 psutil>=5.6.6 From 6530c6db1b1b2e960010191bdff40aaf10fc958d Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 19 Feb 2024 09:33:00 -0500 Subject: [PATCH 3/5] no longer need to restrict GDAL. #1508 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cad4fa0e7f..d20cae2cfa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ # scripts/convert-requirements-to-conda-yml.py as though it can only be found # on pip. -GDAL>=3.4.2,<3.6.0 +GDAL>=3.4.2 Pyro4==4.77 # pip-only pandas>=1.2.1 numpy>=1.11.0,!=1.16.0 From a2c916105cdb7232210cacb19c08dc2799d765d6 Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 19 Feb 2024 10:03:24 -0500 Subject: [PATCH 4/5] restrict gdal to until dealing with DeprecationWarnings. #1508 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d20cae2cfa..2daf7319f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ # scripts/convert-requirements-to-conda-yml.py as though it can only be found # on pip. -GDAL>=3.4.2 +GDAL>=3.4.2,<3.8.0 Pyro4==4.77 # pip-only pandas>=1.2.1 numpy>=1.11.0,!=1.16.0 From 9df565c6e2b43198bd2321137f2e677979ee5571 Mon Sep 17 00:00:00 2001 From: davemfish Date: Mon, 19 Feb 2024 10:16:05 -0500 Subject: [PATCH 5/5] revert the gdal version change. #1508 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2daf7319f9..cad4fa0e7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ # scripts/convert-requirements-to-conda-yml.py as though it can only be found # on pip. -GDAL>=3.4.2,<3.8.0 +GDAL>=3.4.2,<3.6.0 Pyro4==4.77 # pip-only pandas>=1.2.1 numpy>=1.11.0,!=1.16.0