fix: allow pypsa<0.35 (#1786)

Author: lkstrp

scripts/prepare_network.py

@@ -29,16 +29,23 @@
 import numpy as np
 import pandas as pd
 import pypsa
-from pypsa.common import expand_series
 
 from scripts._helpers import (
+    PYPSA_V1,
     configure_logging,
     get,
     set_scenario_config,
     update_config_from_wildcards,
 )
 from scripts.add_electricity import load_costs, set_transmission_costs
 
+# Allow for PyPSA versions <0.35
+if PYPSA_V1:
+    from pypsa.common import expand_series
+else:
+    from pypsa.descriptors import expand_series
+
+
 idx = pd.IndexSlice
 
 logger = logging.getLogger(__name__)

scripts/prepare_perfect_foresight.py

@@ -10,10 +10,10 @@
 import numpy as np
 import pandas as pd
 import pypsa
-from pypsa.common import expand_series
 from six import iterkeys
 
 from scripts._helpers import (
+    PYPSA_V1,
     configure_logging,
     sanitize_custom_columns,
     set_scenario_config,
@@ -22,6 +22,12 @@
 from scripts.add_electricity import sanitize_carriers
 from scripts.add_existing_baseyear import add_build_year_to_new_assets
 
+# Allow for PyPSA versions <0.35
+if PYPSA_V1:
+    from pypsa.common import expand_series
+else:
+    from pypsa.descriptors import expand_series
+
 logger = logging.getLogger(__name__)
 
 

scripts/solve_network.py

@@ -53,7 +53,12 @@
 )
 
 logger = logging.getLogger(__name__)
-pypsa.network.power_flow.logger.setLevel(logging.WARNING)
+
+# Allow for PyPSA versions <0.35
+if PYPSA_V1:
+    pypsa.network.power_flow.logger.setLevel(logging.WARNING)
+else:
+    pypsa.pf.logger.setLevel(logging.WARNING)
 
 
 class ObjectiveValueError(Exception):