Merge pull request #149 from ecobee/dev

adding timezonefinder, bump bleach to 3.3.0, add pytest-profiling

Author: tomstesco

.vscode/settings.json

@@ -27,7 +27,8 @@
         "**/Output_EPExport_Slave": true,
         "**/Output_EPExport_Test FMI 1.0 CS": true,
         "**/test/data": true,
-        "external": true
+        "external": true,
+        "bcs_venv": true,
     },
     "python.linting.pylintEnabled": false,
     "python.linting.flake8Enabled": true,

requirements.txt

@@ -9,7 +9,7 @@ Babel==2.9.0
 backcall==0.2.0
 beautifulsoup4==4.8.0
 black==20.8b1
-bleach==3.2.1
+bleach==3.3.0
 Bottleneck==1.3.2
 cachetools==4.2.0
 casadi==3.5.5
@@ -112,6 +112,7 @@ pyparsing==2.4.7
 pyrsistent==0.17.3
 pytest==6.2.1
 pytest-ordering==0.6
+pytest-profiling==1.7.0
 python-dateutil==2.8.1
 pytz==2020.5
 PyYAML==5.4
@@ -148,7 +149,7 @@ traitlets==5.0.5
 typed-ast==1.4.2
 typing-extensions==3.7.4.3
 typing-inspect==0.6.0
-tzwhere==3.0.3
+timezonefinder==5.2.0
 urllib3==1.26.2
 wcwidth==0.2.5
 webencodings==0.5.1

requirements_unfixed.txt

@@ -2,6 +2,7 @@ google-cloud-bigquery==2.3.1
 jupyterlab==2.2.9
 pytest
 pytest-ordering
+pytest-profiling
 black
 coverage
 sphinx
@@ -28,7 +29,7 @@ dask
 requests
 scikit-learn
 statsmodels
-tzwhere
+timezonefinder
 numexpr
 bottleneck
 casadi

src/python/BuildingControlsSimulator/DataClients/DateTimeChannel.py

@@ -1,9 +1,9 @@
 # created by Tom Stesco tom.s@ecobee.com
 import logging
-from pprint import pprint
 import pytz
 
-from tzwhere import tzwhere
+from timezonefinder import TimezoneFinder
+
 import attr
 import pandas as pd
 
@@ -33,11 +33,7 @@ def timezone(self):
     @staticmethod
     def get_timezone(latitude, longitude):
         """Get pytz timezone object given latitude and longitude."""
-        tzw = tzwhere.tzwhere(forceTZ=True)
+        tf = TimezoneFinder()
         return pytz.timezone(
-            tzw.tzNameAt(
-                latitude=latitude,
-                longitude=longitude,
-                forceTZ=True,
-            )
+            tf.timezone_at(lng=longitude, lat=latitude)
         )