diff --git a/PHX/to_PHPP/xl_data.py b/PHX/to_PHPP/xl_data.py index 59694f3..22cabe6 100644 --- a/PHX/to_PHPP/xl_data.py +++ b/PHX/to_PHPP/xl_data.py @@ -6,7 +6,7 @@ from typing import Union, Optional import string -from honeybee_ph_utils import units +from ph_units.converter import convert xl_writable = Optional[Union[str, float, int, list, tuple]] xl_range_value = Optional[Union[str, float, int]] @@ -36,9 +36,9 @@ def write_value(self): return self._write_value if isinstance(self._write_value, (tuple, list)): - return [units.convert(v, self.input_unit, self.target_unit) for v in self._write_value] + return [convert(v, self.input_unit, self.target_unit) for v in self._write_value] else: - return units.convert(self._write_value, self.input_unit, self.target_unit) + return convert(self._write_value, self.input_unit, self.target_unit) def __str__(self): return f'{self.__class__.__name__}({self.sheet_name}, {self.xl_range}, {self.write_value})' diff --git a/_testing_to_PHPP.py b/_testing_to_PHPP.py index 2321928..80ad13b 100644 --- a/_testing_to_PHPP.py +++ b/_testing_to_PHPP.py @@ -12,11 +12,11 @@ # --- Input file Path # ------------------------------------------------------------------------- -# SOURCE_FILE = pathlib.Path( -# "/Users/em/Dropbox/bldgtyp-00/00_PH_Tools/PHX/tests/_source_hbjson/Default_Model_Single_Zone.hbjson" -# ) SOURCE_FILE = pathlib.Path( - "/Users/em/Dropbox/bldgtyp-00/00_PH_Tools/PHX/sample/hbjson/221104_Whole_Building.hbjson" + "/Users/em/Dropbox/bldgtyp-00/00_PH_Tools/PHX/tests/_source_hbjson/Default_Model_Single_Zone.hbjson" +) +SOURCE_FILE = pathlib.Path( + "/Users/em/Dropbox/bldgtyp-00/00_PH_Tools/PHX/sample/hbjson/221104_Residential.hbjson" ) if __name__ == '__main__': diff --git a/dev-requirements.txt b/dev-requirements.txt index 35cd782..01b4dbd 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,9 +1,9 @@ -coverage>=6.4.1 -pytest>=6.2.4 -pytest-cov>=3.0.0 -rich>=12.4.4 -setuptools>=63.1.0 -Sphinx>=5.0.2 -sphinx-bootstrap-theme>=0.7.1 -twine>=4.0.1 -wheel>=0.36.2 \ No newline at end of file +coverage +pytest +pytest-cov +rich +setuptools +Sphinx +sphinx-bootstrap-theme +twine +wheel \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 452727c..4fd41fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ -honeybee-core>=1.51.47 -honeybee-energy>=1.94.10 -honeybee-ph>=1.3.5 -pydantic>=1.9.1 -rich>=12.4.1 -xlwings>=0.27.8 \ No newline at end of file +honeybee-core>=1.54.2 +honeybee-energy>=1.95.6 +honeybee-ph +PH-units +pydantic +rich +xlwings \ No newline at end of file