Merge branch 'dev' into revision/update_build_system

.gitignore

@@ -63,12 +63,14 @@ docs/_build
 .build
 .ve
 .env
+.venv/
 .cache
 .pytest
 .benchmarks
 .bootstrap
 .appveyor.token
 *.bak
+venv/
 
 # Mypy Cache
 .mypy_cache/

src/demandlib/bdew/elec_slp.py

@@ -109,7 +109,9 @@ def create_bdew_load_profiles(self, dt_index, slp_types, holidays=None):
         tmp_df.set_index(index, inplace=True)
 
         # Create empty DataFrame to take the results.
-        new_df = pd.DataFrame(index=dt_index, columns=slp_types, dtype=float).fillna(0)
+        new_df = pd.DataFrame(
+            index=dt_index, columns=slp_types, dtype=float
+        ).fillna(0)
         new_df = add_weekdays2df(
             new_df, holidays=holidays, holiday_is_sunday=True
         )

src/demandlib/bdew/heat_building.py

@@ -64,10 +64,12 @@ def __init__(self, df_index, **kwargs):
         self.wind_class = kwargs.get("wind_class")
         self.building_class = kwargs.get("building_class", 0)
         # raise error if building class is not 0 for non-residential buildings
-        if (self.shlp_type not in ["EFH", "MFH"]) and (self.building_class != 0):
+        if (self.shlp_type not in ["EFH", "MFH"]) and (
+            self.building_class != 0
+        ):
             raise ValueError(
                 "Building class must be 0 for non-residential buildings"
-                )
+            )
         self.ww_incl = kwargs.get("ww_incl", True)
         self.name = kwargs.get("name", self.shlp_type)
 
@@ -284,7 +286,7 @@ def get_sigmoid_parameters(self, filename="shlp_sigmoid_factors.csv"):
         if len(sigmoid) != 1:
             raise ValueError(
                 wrong_number_of_parameters_message.format(len(sigmoid))
-                )
+            )
 
         # get sigmoid parameters, avoid warning
         a = sigmoid["parameter_a"].iloc[0]

src/demandlib/tools.py

@@ -1,5 +1,6 @@
 """Tools needed by the main classes
 """
+
 import pandas as pd
 
 
@@ -44,6 +45,8 @@ def add_weekdays2df(time_df, holidays=None, holiday_is_sunday=False):
         )
 
     if holiday_is_sunday:
-        time_df.weekday = time_df.weekday.mask(cond=time_df.weekday == 0, other=7)
+        time_df.weekday = time_df.weekday.mask(
+            cond=time_df.weekday == 0, other=7
+        )
 
     return time_df