Merge pull request #209 from ecobee/dev

conditional skipping of DataClient tests if source unconfigured

Author: tomstesco

CHANGELOG.md

@@ -17,3 +17,4 @@
 - fixed `make_data_directories` usage when no local_cache is given
 - fixed `get_local_cache_file` usage when no local_cache is given
 - fixed `DataSpec.py` null_check_columns and units
+- conditional skipping of `DataClient` tests that use external data sources if those sources are not configured

Dockerfile

@@ -82,9 +82,9 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo bash - \
     && pyenv update && pyenv install 3.8.9 \
     && mkdir "${LIB_DIR}" && mkdir "${EXT_DIR}" \
     && cd "${EXT_DIR}" \
-    && wget "https://github.com/modelon-community/fmi-library/archive/2.2.3.zip" \
-    && unzip "2.2.3.zip" && mv "fmi-library-2.2.3" "FMIL" \
-    && rm -rf "2.2.3.zip" \
+    && wget "https://github.com/modelon-community/fmi-library/archive/refs/tags/2.3.zip" \
+    && unzip "2.3.zip" && mv "fmi-library-2.3" "FMIL" \
+    && rm -rf "2.3.zip" \
     && cd "FMIL" \
     && mkdir build-fmil; cd build-fmil \
     && cmake -DFMILIB_INSTALL_PREFIX=./ ../ \
@@ -123,9 +123,9 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo bash - \
     && mv "${EXT_DIR}/Assimulo-Assimulo-3.2.5" "${EXT_DIR}/Assimulo-3.2.5" \
     # get PyFMI source
     && cd "${EXT_DIR}" \
-    && wget "https://github.com/modelon-community/PyFMI/archive/refs/tags/PyFMI-2.8.6.tar.gz" \
-    && tar -xzf "PyFMI-2.8.6.tar.gz" && rm "PyFMI-2.8.6.tar.gz"\
-    && mv "${EXT_DIR}/PyFMI-PyFMI-2.8.6" "${EXT_DIR}/PyFMI" \
+    && wget "https://github.com/modelon-community/PyFMI/archive/refs/tags/PyFMI-2.8.10.tar.gz" \
+    && tar -xzf "PyFMI-2.8.10.tar.gz" && rm "PyFMI-2.8.10.tar.gz"\
+    && mv "${EXT_DIR}/PyFMI-PyFMI-2.8.10" "${EXT_DIR}/PyFMI" \
     # make PACKAGE_DIR and cleanup
     && cd "${LIB_DIR}" \
     && mkdir "${PACKAGE_DIR}" \

requirements.txt

@@ -1,64 +1,65 @@
 adal==1.2.7
 aiohttp==3.7.4.post0
 alabaster==0.7.12
+algopy==0.5.7
 appdirs==1.4.4
 argon2-cffi==20.1.0
 async-generator==1.10
 async-timeout==3.0.1
-attrs==20.3.0
-Babel==2.9.0
+attrs==21.2.0
+Babel==2.9.1
 backcall==0.2.0
 beautifulsoup4==4.8.0
-black==20.8b1
+black==21.6b0
 bleach==3.3.0
 Bottleneck==1.3.2
-cachetools==4.2.1
+cachetools==4.2.2
 casadi==3.5.5
-certifi==2020.12.5
+certifi==2021.5.30
 cffi==1.14.5
 chardet==4.0.0
-click==7.1.2
+click==8.0.1
 cloudpickle==1.6.0
 coverage==5.5
 cryptography==3.4.7
 cycler==0.10.0
 Cython==0.29.23
-dask==2021.4.0
-decorator==5.0.7
+dask==2021.6.0
+decorator==5.0.9
 defusedxml==0.7.1
 docutils==0.16
 entrypoints==0.3
 eppy==0.5.56
-flake8==3.9.1
-fsspec==2021.4.0
+flake8==3.9.2
+fsspec==2021.6.0
 future==0.18.2
-gcsfs==0.8.0
-google-api-core==1.26.3
-google-api-python-client==2.2.0
-google-auth==1.29.0
+gcsfs==2021.6.0
+google-api-core==1.30.0
+google-api-python-client==2.8.0
+google-auth==1.31.0
 google-auth-httplib2==0.1.0
 google-auth-oauthlib==0.4.4
 google-cloud-bigquery==2.3.1
 google-cloud-bigquery-storage==2.4.0
 google-cloud-core==1.6.0
-google-cloud-storage==1.37.1
+google-cloud-storage==1.38.0
 google-crc32c==1.1.2
-google-resumable-media==1.2.0
+google-resumable-media==1.3.0
 googleapis-common-protos==1.53.0
 gprof2dot==2021.2.21
-grpcio==1.37.0
+grpcio==1.38.0
 h5pyd==0.8.0
 httplib2==0.19.1
 idna==2.10
 imagesize==1.2.0
 iniconfig==1.1.1
-ipykernel==5.5.3
-ipython==7.22.0
+ipykernel==5.5.5
+ipython==7.24.1
 ipython-genutils==0.2.0
 ipywidgets==7.6.3
 isodate==0.6.0
 jedi==0.18.0
-Jinja2==2.11.3
+Jinja2==3.0.1
 joblib==1.0.1
 json5==0.9.5
 jsonschema==3.2.0
@@ -69,12 +70,13 @@ jupyterlab-pygments==0.1.2
 jupyterlab-server==1.2.0
 jupyterlab-widgets==1.0.0
 kiwisolver==1.3.1
-libcst==0.3.18
+libcst==0.3.19
 llvmlite==0.36.0
 locket==0.2.1
 lxml==4.6.3
-MarkupSafe==1.1.1
-matplotlib==3.4.1
+MarkupSafe==2.0.1
+matplotlib==3.4.2
+matplotlib-inline==0.1.2
 mccabe==0.6.1
 mistune==0.8.4
 msrest==0.6.21
@@ -86,12 +88,12 @@ nbclient==0.5.3
 nbconvert==6.0.7
 nbformat==5.1.3
 nest-asyncio==1.5.1
-notebook==6.3.0
+notebook==6.4.0
 numba==0.53.1
-numdifftools==0.9.39
+numdifftools==0.9.40
 numexpr==2.7.3
-numpy==1.20.2
-oauthlib==3.1.0
+numpy==1.20.3
+oauthlib==3.1.1
 packaging==20.9
 pandas==1.2.4
 pandas-gbq==0.15.0
@@ -105,10 +107,10 @@ pickleshare==0.7.5
 Pillow==8.2.0
 plotly==4.14.3
 pluggy==0.13.1
-prometheus-client==0.10.1
+prometheus-client==0.11.0
 prompt-toolkit==3.0.18
 proto-plus==1.18.1
-protobuf==3.15.8
+protobuf==3.17.3
 psutil==5.8.0
 ptyprocess==0.7.0
 py==1.10.0
@@ -117,56 +119,54 @@ pyasn1==0.4.8
 pyasn1-modules==0.2.8
 pycodestyle==2.7.0
 pycparser==2.20
-pydata-google-auth==1.1.0
+pydata-google-auth==1.2.0
 pydot3k==1.0.17
 pyflakes==2.3.1
-Pygments==2.8.1
-PyJWT==2.0.1
+Pygments==2.9.0
+PyJWT==2.1.0
 pyparsing==2.4.7
 pyrsistent==0.17.3
-pytest==6.2.3
+pytest==6.2.4
 pytest-ordering==0.6
 pytest-profiling==1.7.0
 python-dateutil==2.8.1
 pytz==2021.1
 PyYAML==5.4.1
-pyzmq==22.0.3
+pyzmq==22.1.0
 regex==2021.4.4
 requests==2.25.1
 requests-oauthlib==1.3.0
 retrying==1.3.3
 rsa==4.7.2
-scikit-learn==0.24.1
-scipy==1.6.2
+scikit-learn==0.24.2
+scipy==1.6.3
 Send2Trash==1.5.0
-six==1.15.0
+six==1.16.0
 snowballstemmer==2.1.0
 soupsieve==2.2.1
-Sphinx==3.5.4
+Sphinx==4.0.2
 sphinx-rtd-theme==0.5.2
 sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-htmlhelp==2.0.0
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.4
+sphinxcontrib-serializinghtml==1.1.5
 statsmodels==0.12.2
-terminado==0.9.4
-testpath==0.4.4
+terminado==0.10.1
+testpath==0.5.0
 threadpoolctl==2.1.0
 timezonefinder==5.2.0
 tinynumpy==1.2.1
 toml==0.10.2
 toolz==0.11.1
 tornado==6.1
-tqdm==4.60.0
+tqdm==4.61.1
 traitlets==5.0.5
-typed-ast==1.4.3
-typing-extensions==3.7.4.3
-typing-inspect==0.6.0
-ujson==4.0.2
+typing-extensions==3.10.0.0
+typing-inspect==0.7.1
 uritemplate==3.0.1
-urllib3==1.26.4
+urllib3==1.26.5
 wcwidth==0.2.5
 webencodings==0.5.1
 widgetsnbextension==3.5.1

setup.py

@@ -4,8 +4,8 @@
 
 # Semantic Versioning (https://semver.org/)
 _MAJOR_VERSION = "0"
-_MINOR_VERSION = "4"
-_PATCH_VERSION = "1"
+_MINOR_VERSION = "5"
+_PATCH_VERSION = "0"
 
 _VERSION_SUFFIX = "alpha"
 

src/python/BuildingControlsSimulator/BuildingModels/test_EnergyPlusBuildingModel.py

@@ -33,38 +33,19 @@ def setup_class(cls):
         cls.eplus_version = os.environ["ENERGYPLUS_INSTALL_VERSION"]
 
         # basic IDF file found in all EnergyPlus installations
-        # cls.dummy_idf_name = "Furnace.idf"
-
-        # cls.dummy_epw_name = "USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"
-
         # make test/ dirs
         EnergyPlusBuildingModel.make_directories()
-        # cls.building_model = EnergyPlusBuildingModel(
-        #     idf=IDFPreprocessor(
-        #         idf_file=cls.dummy_idf_path,
-        #         init_temperature=20.0,
-        #     ),
-        #     epw_path=cls.dummy_epw_path,
-        #     step_size_seconds=300,
-        # )
 
         cls.step_size = 300
 
-    # @pytest.mark.parametrize(
-    #     "dummy_idf_name, dummy_epw_path",
-    #     [("Furnace.idf", "USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw")],
-    # )
+
     # pytest requires the obj containing the params to be called "request"
     @pytest.fixture(
         params=[
             (
                 "Furnace.idf",
                 "USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw",
             ),
-            # (
-            #     "IL_Chicago_gasfurnace_heatedbsmt_IECC_2018.idf.idf",
-            #     "USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw",
-            # ),
         ]
     )
     def building_model(self, request):

src/python/BuildingControlsSimulator/Conversions/Conversions.py

@@ -26,7 +26,7 @@ def saturation_vapor_pressure(temperature):
 
     @staticmethod
     def relative_humidity_from_dewpoint(temperature, dewpoint):
-        """ Return RH in % [0-100]"""
+        """Return RH in % [0-100]"""
         return (
             Conversions.saturation_vapor_pressure(dewpoint)
             / Conversions.saturation_vapor_pressure(temperature)

src/python/BuildingControlsSimulator/DataClients/test_GBQFlatFilesSource.py

@@ -19,6 +19,12 @@
 logger = logging.getLogger(__name__)
 
 
+@pytest.mark.skipif(
+    (not os.environ.get("TEST_FLATFILES_GBQ_IDENTIFIER"))
+    or (not os.environ.get("FLATFILE_GOOGLE_CLOUD_PROJECT"))
+    or (not os.environ.get("FLATFILES_GBQ_TABLE")),
+    reason="GBQ FlatFiles not configured.",
+)
 class TestGBQFlatFilesSource:
     @classmethod
     def setup_class(cls):

src/python/BuildingControlsSimulator/DataClients/test_GCSDYDSource.py

@@ -18,6 +18,11 @@
 logger = logging.getLogger(__name__)
 
 
+@pytest.mark.skipif(
+    (not os.environ.get("DYD_GOOGLE_CLOUD_PROJECT"))
+    or (not os.environ.get("DYD_GCS_URI_BASE")),
+    reason="GCS output not configured.",
+)
 class TestGCSDYDSource:
     @classmethod
     def setup_class(cls):

src/python/BuildingControlsSimulator/DataClients/test_GCSDestination.py

@@ -22,6 +22,11 @@
 logger = logging.getLogger(__name__)
 
 
+@pytest.mark.skipif(
+    (not os.environ.get("BCS_GOOGLE_CLOUD_PROJECT"))
+    or (not os.environ.get("BCS_OUTPUT_GCS_URI_BASE")),
+    reason="GCS output not configured.",
+)
 class TestGCSDestination:
     @classmethod
     def setup_class(cls):

src/python/BuildingControlsSimulator/DataClients/test_GCSFlatFilesSource.py

@@ -19,6 +19,11 @@
 logger = logging.getLogger(__name__)
 
 
+@pytest.mark.skipif(
+    (not os.environ.get("FLATFILE_GOOGLE_CLOUD_PROJECT"))
+    or (not os.environ.get("FLATFILES_GCS_URI_BASE")),
+    reason="GCS output not configured.",
+)
 class TestGCSFlatFilesSource:
     @classmethod
     def setup_class(cls):