Fixes to adapt to geopandas >=1

pypsa-meets-earth · Dec 23, 2024 · b1f530b · b1f530b
1 parent 255aa60
commit b1f530b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scripts/_helpers.py b/scripts/_helpers.py
@@ -60,7 +60,8 @@ def check_config_version(config, fp_config=CONFIG_DEFAULT_PATH):
             f"The current version of 'config.yaml' doesn't match to the code version:\n\r"
             f" {current_config_version} provided, {actual_config_version} expected.\n\r"
             f"That can lead to weird errors during execution of the workflow.\n\r"
-            f"Please update 'config.yaml' according to 'config.default.yaml' ."
+            f"Please update 'config.yaml' according to 'config.default.yaml'\n\r"
+            "and update the environment to the latest version."
         )
 
 

diff --git a/scripts/build_bus_regions.py b/scripts/build_bus_regions.py
@@ -141,7 +141,7 @@ def get_gadm_shape(
     # when duplicates, keep only the first entry
     join_geos = join_geos[~join_geos.index.duplicated()]
 
-    gadm_sel = gadm_shapes.loc[join_geos["index_right"].values]
+    gadm_sel = gadm_shapes.loc[join_geos[gadm_shapes.index.name].values]
 
     return gadm_sel.geometry.values, gadm_sel.index.values