From c7fea3f41afff2f0e842d6f78f522fb1925ee891 Mon Sep 17 00:00:00 2001 From: Luke Friedrichs Date: Wed, 10 Dec 2025 18:57:09 +0100 Subject: [PATCH 1/2] fixed missing dependencies and added abosulte path to SIA.py Otherwise the datahandler breaks when not run from the correct dir. --- districtgenerator/functions/SIA.py | 6 +++++- setup.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/districtgenerator/functions/SIA.py b/districtgenerator/functions/SIA.py index dd45aeb1..22d15eae 100644 --- a/districtgenerator/functions/SIA.py +++ b/districtgenerator/functions/SIA.py @@ -2,10 +2,14 @@ import pandas as pd +import os def read_SIA_data(): - data = pd.read_excel('../districtgenerator/data/SIA2024.xlsx', sheet_name='SIA2024', header=1) + current_dir = os.path.dirname(os.path.abspath(__file__)) + data_path = os.path.join(current_dir, '..', 'data', 'SIA2024.xlsx') + + data = pd.read_excel(data_path, sheet_name='SIA2024', header=1) df = pd.DataFrame(data, columns=['number', 'Zone_name_GER', 'T_summer', 'T_winter', 'area_room', 'dQ_persons_perA', 't_fullLoad_persons', 'P_vent_perVh', 'P_vent_perA', 'W_per_person', 'Q_domHotWater_perA_year', 'window_wall_ratio', 'wwr_faktor_windowframes', diff --git a/setup.py b/setup.py index 0e9c3a6b..d7e2d0a1 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,10 @@ 'pyproj~=3.7.0', 'openpyxl==3.1.5', 'seaborn==0.13.2', - 'OpenDHW>=0.2.2' + 'OpenDHW>=0.2.2', + 'reportlab>=4.4.6', + 'pydantic>=2.12.5', + 'pydantic-settings>=2.12.0', ], classifiers=("Programming Language :: Python :: 3", ), ) \ No newline at end of file From 3f2db030ac4d62f596ceec3bc8e5b29a505e5de3 Mon Sep 17 00:00:00 2001 From: Luke Friedrichs Date: Wed, 10 Dec 2025 22:34:38 +0100 Subject: [PATCH 2/2] Create __init__.py --- districtgenerator/data_handling/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 districtgenerator/data_handling/__init__.py diff --git a/districtgenerator/data_handling/__init__.py b/districtgenerator/data_handling/__init__.py new file mode 100644 index 00000000..e69de29b