Merge branch 'release/1.7.5'

dev-requirements.txt

@@ -5,3 +5,4 @@ coverage
 jupyter
 tox
 pytest-cov
+pip-tools

docs/rtd_requirements.txt

@@ -1,5 +1,5 @@
-numpy==1.18.4
-pandas==0.24.2
-python-dateutil==2.8.1
-pytz==2020.1
-six==1.15.0
+numpy==1.22.2
+pandas==1.4.1
+python-dateutil==2.8.2
+pytz==2021.3
+six==1.16.0

requirements.in

@@ -0,0 +1,22 @@
+certifi>=2022.12.07
+charset-normalizer
+click
+eemeter
+eeweather
+greenlet
+idna
+numpy
+packaging
+pandas
+patsy
+pyparsing
+pyproj
+python-dateutil
+pytz
+requests
+scipy
+shapely
+six
+sqlalchemy
+statsmodels
+urllib3

requirements.txt

@@ -1,65 +1,97 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    pip-compile
 #
-certifi==2021.10.8
+certifi==2022.12.7
     # via
+    #   -r requirements.in
     #   pyproj
     #   requests
 charset-normalizer==2.0.12
-    # via requests
+    # via
+    #   -r requirements.in
+    #   requests
 click==8.0.4
     # via
+    #   -r requirements.in
     #   eemeter
     #   eeweather
 eemeter==3.1.0
-    # via thermostat (setup.py)
+    # via -r requirements.in
 eeweather==0.3.24
-    # via thermostat (setup.py)
+    # via -r requirements.in
 greenlet==1.1.2
-    # via sqlalchemy
+    # via
+    #   -r requirements.in
+    #   sqlalchemy
 idna==3.3
-    # via requests
+    # via
+    #   -r requirements.in
+    #   requests
 numpy==1.22.2
     # via
+    #   -r requirements.in
     #   pandas
     #   patsy
     #   scipy
     #   statsmodels
 packaging==21.3
-    # via statsmodels
+    # via
+    #   -r requirements.in
+    #   statsmodels
 pandas==1.4.1
     # via
+    #   -r requirements.in
     #   eemeter
     #   eeweather
     #   statsmodels
 patsy==0.5.2
-    # via statsmodels
+    # via
+    #   -r requirements.in
+    #   statsmodels
 pyparsing==3.0.7
-    # via packaging
+    # via
+    #   -r requirements.in
+    #   packaging
 pyproj==3.3.0
-    # via eeweather
+    # via
+    #   -r requirements.in
+    #   eeweather
 python-dateutil==2.8.2
-    # via pandas
+    # via
+    #   -r requirements.in
+    #   pandas
 pytz==2021.3
-    # via pandas
+    # via
+    #   -r requirements.in
+    #   pandas
 requests==2.27.1
-    # via eeweather
+    # via
+    #   -r requirements.in
+    #   eeweather
 scipy==1.8.0
     # via
+    #   -r requirements.in
     #   eemeter
     #   statsmodels
 shapely==1.8.1.post1
-    # via eeweather
+    # via
+    #   -r requirements.in
+    #   eeweather
 six==1.16.0
     # via
+    #   -r requirements.in
     #   patsy
     #   python-dateutil
 sqlalchemy==1.4.31
-    # via thermostat (setup.py)
+    # via -r requirements.in
 statsmodels==0.13.2
-    # via eemeter
+    # via
+    #   -r requirements.in
+    #   eemeter
 urllib3==1.26.8
-    # via requests
+    # via
+    #   -r requirements.in
+    #   requests

scripts/lxc/epathermostat_test

@@ -0,0 +1,21 @@
+#!/bin/bash
+CONTAINER=epathermostat
+lxc stop $CONTAINER
+lxc delete $CONTAINER
+lxc launch ubuntu:20.04 $CONTAINER -c security.privileged=true
+sleep 3
+lxc config device add $CONTAINER homedir disk source=/home/craig/projects/epathermostat path=/home/ubuntu/epathermostat
+sleep 3
+lxc exec $CONTAINER -- sudo add-apt-repository ppa:deadsnakes/ppa -y
+lxc exec $CONTAINER -- sudo apt install -y \
+    build-essential sqlite3 \
+    python3.10 python3.10-dev python3.10-venv \
+    python3.9 python3.9-dev python3.9-venv \
+    python3.8 python3.8-dev python3.8-venv \
+    python3.7 python3.7-dev python3.7-venv \
+    python3.6 python3.6-dev python3.6-venv
+lxc exec $CONTAINER -- sudo chown ubuntu /home/ubuntu
+lxc exec $CONTAINER -- sudo --login --user ubuntu /usr/bin/python3.9 -m venv /home/ubuntu/venv
+lxc exec $CONTAINER -- sudo --login --user ubuntu /home/ubuntu/venv/bin/pip install -r /home/ubuntu/epathermostat/dev-requirements.txt
+lxc exec $CONTAINER -- sudo --login --user ubuntu mkdir /home/ubuntu/.eeweather
+lxc exec $CONTAINER -- sudo --login --user ubuntu bash -c "zcat /home/ubuntu/epathermostat/thermostat/resources/cache.sql.gz | sqlite3 /home/ubuntu/.eeweather/cache.db"

scripts/lxc/run_tox

@@ -0,0 +1,7 @@
+#!/bin/bash
+CONTAINER=epathermostat
+lxc start $CONTAINER
+sleep 3
+lxc exec $CONTAINER -- sudo --login --user ubuntu bash -c "source venv/bin/activate && cd /home/ubuntu/epathermostat/ && tox -pall -r"
+rsync -avip --delete /home/craig/projects/epathermostat/htmlcov/ /home/craig/Downloads/inbox/htmlcov/
+lxc stop $CONTAINER

tests/fixtures/thermostats.py

@@ -169,7 +169,7 @@ def metrics_type_1_data():
 
     # this data comes from a script in scripts/test_data_generation.ipynb
     data = [{
-        'sw_version': '1.7.4',
+        'sw_version': '1.7.5',
         'ct_identifier': '8465829e-df0d-449e-97bf-96317c24dec3',
         'equipment_type': 1,
         'heating_or_cooling': 'cooling_ALL',
@@ -211,7 +211,7 @@ def metrics_type_1_data():
         'core_mean_indoor_temperature': 73.95971753003002,
         'core_mean_outdoor_temperature': 79.8426321875
         }, {
-        'sw_version': '1.7.4',
+        'sw_version': '1.7.5',
         'ct_identifier': '8465829e-df0d-449e-97bf-96317c24dec3',
         'equipment_type': 1,
         'heating_or_cooling': 'heating_ALL',

thermostat/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 7, 4)
+VERSION = (1, 7, 5)
 
 def get_version():
     return '{}.{}.{}'.format(VERSION[0], VERSION[1], VERSION[2])

tox.ini

@@ -7,7 +7,6 @@ addopts =
     --cov-report=term-missing --cov=thermostat --cov-append -x
 
 [testenv]
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps =
     pytest
     pytest-cov