From 56b22a3b4ea3e95e521bf4234b21899a963eefb5 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 30 Jan 2024 10:29:08 +0100 Subject: [PATCH] env: correct pyscipopt dependency cluster_network: address deprecation warning --- envs/environment.yaml | 2 +- scripts/cluster_network.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index 895b271a..d92eb696 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -36,7 +36,7 @@ dependencies: - networkx - scipy - shapely>=2.0 -- scipopt +- pyscipopt - matplotlib - proj - fiona diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index b63e7f89..2c69b9af 100644 --- 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") )