From bba4857025094d2946e4c0c7e8db45e67ed182e5 Mon Sep 17 00:00:00 2001 From: martacki Date: Mon, 1 Jul 2024 15:07:20 +0200 Subject: [PATCH 1/2] restrict geopandas until conflicts are resolved --- envs/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index 37c3870b3..9f7eaf9f9 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -28,7 +28,7 @@ dependencies: - powerplantmatching>=0.5.15 - numpy - pandas>=2.1 -- geopandas>=0.11.0 +- geopandas>=0.11.0, <=0.14.3 - xarray>=2023.11.0 - rioxarray - netcdf4 From 358561a619099897bdeb6dd45042d0b20ed580ea Mon Sep 17 00:00:00 2001 From: Martha Frysztacki Date: Wed, 3 Jul 2024 08:33:03 +0200 Subject: [PATCH 2/2] Update envs/environment.yaml Co-authored-by: Fabian Neumann --- envs/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index d01d5aad1..e57c87612 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -28,7 +28,7 @@ dependencies: - powerplantmatching>=0.5.15 - numpy - pandas>=2.1 -- geopandas>=0.11.0, <=0.14.3 +- geopandas>=0.11.0, <1 - xarray>=2023.11.0 - rioxarray - netcdf4