Merge remote-tracking branch 'origin/master'

# Conflicts: # .gitignore
2022-04-12 07:05:13 -04:00 · 2022-04-12 07:05:13 -04:00 · 5cddbd363f
commit 5cddbd363f
parent a0bae83ff5 c876e3d74b
3 changed files with 1 additions and 1 deletions
--- a/exports/energy_systems/pycache/init.cpython-38.pyc
+++ b/exports/energy_systems/pycache/init.cpython-38.pyc
--- a/exports/energy_systems/pycache/heat_pump_export.cpython-38.pyc
+++ b/exports/energy_systems/pycache/heat_pump_export.cpython-38.pyc
--- a/exports/energy_systems/air_source_hp_export.py
+++ b/exports/energy_systems/air_source_hp_export.py
@ -27,7 +27,7 @@ class AirSourceHPExport(HeatPumpExport):
    template_path = (base_path / tmp_file)
    super().__init__(base_path, city, output_path, template_path)

-  def _extract_model_coff(self, hp_model: str, data_type='heat') -> Union[Tuple[List, List], None]:
+  def _extract_model_coff(self, hp_model: str, data_type='heat') -> Union[List, None]:
    """
    Extracts heat pump coefficient data for a specific
    model. e.g 012, 140