From 86de5a33ca4a71d01bb93ebe3bc48f5f90de35d7 Mon Sep 17 00:00:00 2001 From: guille Date: Tue, 28 Mar 2023 10:41:29 -0400 Subject: [PATCH 1/2] Correct cerc-hub installer to include dependencies --- hub/unittests/test_exports.py | 6 +++--- requirements.txt | 3 ++- setup.py | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hub/unittests/test_exports.py b/hub/unittests/test_exports.py index aad41374..3487569f 100644 --- a/hub/unittests/test_exports.py +++ b/hub/unittests/test_exports.py @@ -106,9 +106,9 @@ class TestExports(TestCase): path=file_path, function_to_hub=Dictionaries().alkis_function_to_hub_function).city self.assertIsNotNone(city, 'city is none') - # EnergyBuildingsExportsFactory('idf', city, self._output_path).export() - # ConstructionFactory('nrcan', city).enrich() - # EnergyBuildingsExportsFactory('idf', city, self._output_path).export() + EnergyBuildingsExportsFactory('idf', city, self._output_path).export() + ConstructionFactory('nrcan', city).enrich() + EnergyBuildingsExportsFactory('idf', city, self._output_path).export() UsageFactory('nrcan', city).enrich() try: EnergyBuildingsExportsFactory('idf', city, self._output_path).export() diff --git a/requirements.txt b/requirements.txt index 1d53e0cb..72293904 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,5 @@ shapely geopandas triangle psycopg2-binary -Pillow \ No newline at end of file +Pillow +pathlib \ No newline at end of file diff --git a/setup.py b/setup.py index fc8b3bd1..bbc2f8f3 100644 --- a/setup.py +++ b/setup.py @@ -80,6 +80,7 @@ setup( 'hub.imports' ], setup_requires=install_requires, + install_requires=install_requires, data_files=[ ('hub', glob.glob('requirements.txt')), ('hub/config', glob.glob('hub/config/*.ini')), From 1947b1ec37b712fd6656aa9b8552eccb672e0084 Mon Sep 17 00:00:00 2001 From: guille Date: Tue, 28 Mar 2023 10:48:49 -0400 Subject: [PATCH 2/2] version 0.1.7.11 --- hub/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hub/version.py b/hub/version.py index 5fa8186c..56020e2f 100644 --- a/hub/version.py +++ b/hub/version.py @@ -1 +1 @@ -__version__ = '0.1.7.10' +__version__ = '0.1.7.11'