Fix and add pre-commit

Author: lkstrp

.github/workflows/test.yaml

@@ -62,7 +62,7 @@ jobs:
     - name: Setup cache keys
       run: |
         echo "WEEK=$(date +'%Y%U')" >> $GITHUB_ENV # data and cutouts
-  
+
     - uses: actions/cache@v4
       with:
         path: |
@@ -88,7 +88,7 @@ jobs:
       run: |
         conda env update -n pypsa-de -f ${{ env.env_file }}
         echo "Run conda list" && conda list
-    
+
     - name: Setup ixmp4 access
       run: |
         mkdir -p ~/.local/share/ixmp4/
@@ -161,7 +161,7 @@ jobs:
         else
             echo "pinned=false" >> $GITHUB_ENV
         fi
-    
+
     - name: Setup cache keys
       if: env.pinned == 'false'
       run: |
@@ -221,4 +221,4 @@ jobs:
           logs
           .snakemake/log
           results
-        retention-days: 3
+        retention-days: 3

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
   rev: v2.4.1
   hooks:
   - id: codespell
-    args: ['--ignore-regex="(\b[A-Z]+\b)"', '--ignore-words-list=fom,appartment,bage,ore,setis,tabacco,berfore,vor,pris'] # Ignore capital case words, e.g. country codes
+    args: ['--ignore-regex="(\b[A-Z]+\b)"', '--ignore-words-list=fom,appartment,bage,ore,setis,tabacco,berfore,vor,pris,GuD,Dezember,Juni,Juli,Produktion,WorstCase'] # Ignore capital case words, e.g. country codes
     types_or: [python, rst, markdown]
     files: ^(scripts|doc)/
 

config/test/config.dach.yaml

@@ -54,4 +54,4 @@ electricity:
 solving:
   solver:
     name: highs
-    options: highs-simplex
+    options: highs-simplex

scripts/_helpers.py

@@ -47,7 +47,7 @@ def get_scenarios(run):
         fn = Path(scenario_config["file"])
         if fn.exists():
             scenarios = yaml.safe_load(fn.read_text())
-            if scenarios == None:
+            if scenarios is None:
                 print(
                     "WARNING! Scenario management enabled but scenarios file appears to be empty."
                 )

scripts/add_existing_baseyear.py

@@ -23,6 +23,7 @@
     update_config_from_wildcards,
 )
 from scripts.add_electricity import sanitize_carriers
+from scripts.build_powerplants import add_custom_powerplants
 from scripts.definitions.heat_system import HeatSystem
 from scripts.prepare_sector_network import (
     cluster_heat_buses,
@@ -35,8 +36,6 @@
 idx = pd.IndexSlice
 spatial = SimpleNamespace()
 
-from scripts.build_powerplants import add_custom_powerplants
-
 
 def add_build_year_to_new_assets(n: pypsa.Network, baseyear: int) -> None:
     """
@@ -496,8 +495,8 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
 
     # drop assets which are already phased out / decommissioned
     # drop hydro, waste and oil fueltypes for CHP
-    limit = np.max(grouping_years)
-    drop_fueltypes = ["Hydro", "Other", "Waste", "nicht biogener Abfall"]
+    limit = np.max(grouping_years)  # noqa
+    drop_fueltypes = ["Hydro", "Other", "Waste", "nicht biogener Abfall"]  # noqa
     chp = ppl.query(
         "Set == 'CHP' and (DateOut >= @baseyear or DateOut != DateOut) and (DateIn <= @limit or DateIn != DateIn) and Fueltype not in @drop_fueltypes"
     ).copy()
@@ -1052,7 +1051,6 @@ def add_heating_capacities_installed_before_baseyear(
             )
 
             # delete links with capacities below threshold
-            threshold = snakemake.params.existing_capacities["threshold_capacity"]
             n.remove(
                 "Link",
                 [

scripts/build_hourly_heat_demand.py

@@ -19,6 +19,7 @@
     configure_logging,
     generate_periodic_profiles,
     get_snapshots,
+    mock_snakemake,
     set_scenario_config,
 )
 

scripts/make_summary.py

@@ -11,14 +11,12 @@
 
 import numpy as np
 import pandas as pd
-
-pd.set_option("future.no_silent_downcasting", True)
-
 import pypsa
 
 from scripts._helpers import configure_logging, get_snapshots, set_scenario_config
 from scripts.prepare_sector_network import prepare_costs
 
+pd.set_option("future.no_silent_downcasting", True)
 idx = pd.IndexSlice
 logger = logging.getLogger(__name__)
 opt_name = {"Store": "e", "Line": "s", "Transformer": "s"}

scripts/make_summary_perfect.py

@@ -10,15 +10,13 @@
 import numpy as np
 import pandas as pd
 import pypsa
-from _helpers import set_scenario_config
 from make_summary import (
     assign_carriers,
     assign_locations,
     calculate_cfs,  # noqa: F401
     calculate_nodal_cfs,  # noqa: F401
     calculate_nodal_costs,  # noqa: F401
 )
-from prepare_sector_network import prepare_costs
 from pypsa.descriptors import get_active_assets
 from six import iteritems
 

scripts/plot_statistics_comparison.py

@@ -77,7 +77,6 @@ def read_csv(input, output):
             keys=network_labels,
         )
         # get plot label and drop from index
-        label = df.columns.get_level_values(1).unique()[0]
         df.columns = df.columns.droplevel(1)
     except Exception as e:
         print(f"Error reading csv file for {output}: {e}")

scripts/prepare_perfect_foresight.py

@@ -6,7 +6,6 @@
 """
 
 import logging
-from typing import List
 
 import numpy as np
 import pandas as pd
@@ -563,40 +562,7 @@ def apply_time_segmentation_perfect(
     n.snapshot_weightings = n.snapshot_weightings.mul(sn_weightings, axis=0)
 
 
-def update_heat_pump_efficiency(n: pypsa.Network, years: list[int]) -> None:
-    """
-    Update the efficiency of heat pumps from previous years to current year
-    (e.g. 2030 heat pumps receive 2040 heat pump COPs in 2030).
-
-    Note: this also updates the efficiency of heat pumps in preceding years for previous years, which should have no effect (e.g. 2040 heat pumps receive 2030 COPs in 2030).
-
-    Parameters
-    ----------
-    n : pypsa.Network
-        The concatenated network.
-    years : list[int]
-        List of planning horizon years.
-
-    Returns
-    -------
-    None
-        This function updates the efficiency in place and does not return a value.
-    """
-
-    # get names of all heat pumps
-    heat_pump_idx = n.links.index[n.links.index.str.contains("heat pump")]
-    for year in years:
-        # for each heat pump type, correct efficiency is the efficiency of that technology built in <year>
-        correct_efficiency = n.links_t["efficiency"].loc[
-            (year, slice(None)), heat_pump_idx.str[:-4] + str(year)
-        ]
-        # in <year>, set the efficiency of all heat pumps to the correct efficiency
-        n.links_t["efficiency"].loc[(year, slice(None)), heat_pump_idx] = (
-            correct_efficiency.values
-        )
-
-
-def update_heat_pump_efficiency(n: pypsa.Network, years: List[int]):
+def update_heat_pump_efficiency(n: pypsa.Network, years: list[int]):
     """
     Update the efficiency of heat pumps from previous years to current year
     (e.g. 2030 heat pumps receive 2040 heat pump COPs in 2030).