env: correct pyscipopt dependency

cluster_network: address deprecation warning
2024-01-30 10:29:08 +01:00 · 2024-01-30 10:29:08 +01:00 · 56b22a3b4e
commit 56b22a3b4e
parent ca1628a585
2 changed files with 2 additions and 2 deletions
--- a/envs/environment.yaml
+++ b/envs/environment.yaml
@ -36,7 +36,7 @@ dependencies:
 - networkx
 - scipy
 - shapely>=2.0
- scipopt
+- pyscipopt
 - matplotlib
 - proj
 - fiona
--- a/scripts/cluster_network.py
+++ b/scripts/cluster_network.py
@ -364,7 +364,7 @@ def busmap_for_n_clusters(

    return (
        n.buses.groupby(["country", "sub_network"], group_keys=False)
-        .apply(busmap_for_country)
+        .apply(busmap_for_country, include_groups=False)
        .squeeze()
        .rename("busmap")
    )