Release v1.16.0

dsmrreader · Apr 4, 2018 · 7e80bdf · 7e80bdf
1 parent e5b82e4
commit 7e80bdf
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 14 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -4,7 +4,7 @@
 *(Indien van toepassing)*
 * DSMR-reader versie *(rechtsbovenin applicatie zichtbaar)*: `v1.X.Y`
 * Hardware *(RaspberryPi 2, 3 of iets anders)*: `RaspberryPi X...`
-* DSMR-protocol versie van slimme meter *(v4 of v5)*: `v...`
+* DSMR-protocol versie van slimme meter *(v2, v4 of v5)*: `v...`
 
 ### Bug, wens of iets anders
 * Bijvoorbeeld stappen hoe een probleem te reproduceren is...

diff --git a/docs/application.rst b/docs/application.rst
@@ -116,6 +116,9 @@ Public webinterface warning
 
 - Open the site's vhost in ``/etc/nginx/sites-enabled/dsmr-webinterface`` and **uncomment** the following lines (remove the ##)::
 
+    ##    satisfy    any;
+    ##    allow      192.168.1.0/24;
+    ##    deny       all;
     ##    auth_basic "Restricted application";
     ##    auth_basic_user_file /etc/nginx/htpasswd;
     

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -18,6 +18,18 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 
 
 
+v1.16.0 - 2018-04-04
+^^^^^^^^^^^^^^^^^^^^
+
+**Tickets resolved in this release:**
+
+- [`#458 <https://github.com/dennissiemensma/dsmr-reader/issues/458>`_] DSMR v2.x parse-fout - by mrvanes 
+- [`#455 <https://github.com/dennissiemensma/dsmr-reader/issues/455>`_] DOCS: Handleiding Nginx authenticatie uitbreiden - by FutureCow 
+- [`#461 <https://github.com/dennissiemensma/dsmr-reader/issues/461>`_] Requirements update April 2018
+- Fixed some missing names on the contribution page in the DOCS
+
+
+
 v1.15.0 - 2018-03-21
 ^^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/credits.rst b/docs/credits.rst
@@ -11,15 +11,20 @@ Special thanks for supplying code contributions
 Also many thanks to the contributions (reporting) of
 ----------------------------------------------------
 Listed in any order, sorted by name.
-  
+
 - `allureGOT <https://github.com/allureGOT>`_
 - `balk77 <https://github.com/balk77>`_
+- `Baseje <https://github.com/Baseje>`_
 - `Bert-Jan Vos <https://www.linkedin.com/in/bert-jan-vos-82011712>`_
+- `Calimerorulez <https://github.com/Calimerorulez>`_
 - `dajappie <https://github.com/dajappie>`_
 - `Daniel ter Horst <https://www.linkedin.com/in/danielterhorst>`_
 - `dbmnl <https://github.com/dbmnl>`_
 - `emilkwaaitaal <https://github.com/emilkwaaitaal>`_
+- `Ernst79 <https://github.com/Ernst79>`_
+- `f0nt4 <https://github.com/f0nt4>`_
 - `fpompert <https://github.com/fpompert>`_
+- `FutureCow <https://github.com/FutureCow>`_
 - `Gert Schaafsma <https://www.linkedin.com/in/gertschaafsma>`_
 - `gertjuhh <https://github.com/gertjuhh>`_
 - `goegol <https://github.com/goegol>`_
@@ -28,18 +33,22 @@ Listed in any order, sorted by name.
 - `HugoDaBosss <https://github.com/HugoDaBosss>`_
 - `Jelte Leijenaar <https://www.linkedin.com/in/jelteleijenaar>`_ 
 - `Jeroen Tielen <https://nl.linkedin.com/in/jeroentielen>`_
+- `joopy <https://github.com/joopy>`_
 - `Joris Vervuurt <https://github.com/jorisvervuurt>`_
 - `ju5t <https://github.com/ju5t>`_
+- `jwveldhuis <https://github.com/jwveldhuis>`_
 - Koen Volleberg
 - `lckarssen <https://github.com/lckarssen>`_
 - `MarsWarrior <https://github.com/MarsWarrior>`_
 - `mbnn <https://github.com/mbnn>`_
 - `meijjaa <https://github.com/meijjaa>`_
 - `michielvisser <https://github.com/michielvisser>`_
 - `mkruiver <https://github.com/mkruiver>`_
+- `mrvanes <https://github.com/mrvanes>`_ 
 - `Paul Vinken <https://nl.linkedin.com/in/paul-vinken-934a7a44>`_
 - `perryodk <https://github.com/perryodk>`_
 - `pyrocumulus <https://github.com/pyrocumulus>`_
+- `raoulteeuwen  <https://github.com/raoulteeuwen >`_
 - `Sander de Leeuw <https://www.linkedin.com/in/sander-de-leeuw-58313aa0>`_
 - `Sevickson <https://github.com/sevickson>`_
 - `ThinkPadNL <https://github.com/ThinkPadNL>`_

diff --git a/dsmr_backend/management/commands/development_reset.py b/dsmr_backend/management/commands/development_reset.py
@@ -32,7 +32,7 @@ def handle(self, **options):
         BackupSettings.objects.update(daily_backup=False)
         DropboxSettings.objects.update(access_token=None)
         MinderGasSettings.objects.update(export=False, auth_token=None)
-        NotificationSetting.objects.update(send_notification=False, api_key=None)
+        NotificationSetting.objects.update(notification_service=None, api_key=None)
         Notification.objects.update(read=True)
 
         try:

diff --git a/dsmr_datalogger/services.py b/dsmr_datalogger/services.py
@@ -143,7 +143,7 @@ def _convert_legacy_dsmr_gas_line(parsed_reading, current_line, next_line):
         legacy_gas_line = current_line + next_line
 
     legacy_gas_result = re.search(
-        r'[^(]+\((\d+)\)\(\d+\)\(\d+\)\(\d+\)\([0-9-.:]+\)\(m3\)\(([0-9.]+)\)',
+        r'[^(]+\((\d+)\)\(\w+\)\(\d+\)\(\d+\)\([0-9-.:]+\)\(m3\)\(([0-9.]+)\)',
         legacy_gas_line
     )
     gas_timestamp = legacy_gas_result.group(1)

diff --git a/dsmr_datalogger/tests/datalogger/test_iskra.py b/dsmr_datalogger/tests/datalogger/test_iskra.py
@@ -37,7 +37,7 @@ def _dsmr_dummy_data(self):
             "0-0:96.13.0()\r\n",
             "0-1:24.1.0(3)\r\n",
             "0-1:96.1.0(xxxxxxxxxxxx)\r\n",
-            "0-1:24.3.0(160410130000)(00)(60)(1)(0-1:24.2.1)(m3)\r\n",
+            "0-1:24.3.0(160410130000)(2C)(60)(1)(0-1:24.2.1)(m3)\r\n",
             "(07890.693)\r\n",
             "0-1:24.4.0(1)\r\n",
             "!",

diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py
@@ -17,6 +17,6 @@
 from django.utils.version import get_version
 
 
-VERSION = (1, 15, 0, 'final', 1)
+VERSION = (1, 16, 0, 'final', 0)
 
 __version__ = get_version(VERSION)
diff --git a/dsmrreader/provisioning/nginx/dsmr-webinterface b/dsmrreader/provisioning/nginx/dsmr-webinterface
@@ -6,8 +6,12 @@ server {
     listen      80;
     server_name _;  # No hostname available? Just use the underscore for wildcard matching. :]
 
-##	# Uncomment these lines to force additional authentication on application access.
-##  # Do not forget to generate a password first in '/etc/nginx/htpasswd' and then RELOAD nginx!
+	# Uncomment these lines below to force additional authentication on application access.
+	# NOTE: Alter the IP-range '192.168.1.0/24' if you are using a different one (i.e.: 10.0.x.x)!
+    # WARNING: Do not forget to generate a password first in '/etc/nginx/htpasswd' and then RELOAD nginx (TEST IT)!
+##    satisfy    any;
+##    allow      192.168.1.0/24;
+##    deny       all;
 ##    auth_basic "Restricted application";
 ##    auth_basic_user_file /etc/nginx/htpasswd;
 

diff --git a/dsmrreader/provisioning/requirements/base.txt b/dsmrreader/provisioning/requirements/base.txt
@@ -1,16 +1,16 @@
 crcmod==1.7
 coreapi==2.3.3
-django==2.0.3
+django==2.0.4
 django-colorfield==0.1.14
 django-debug-toolbar==1.9.1
 django-filter==1.1.0
-djangorestframework==3.7.7
+djangorestframework==3.8.0
 django-solo==1.1.3
 dropbox==8.7.1
 gunicorn==19.7.1
 paho-mqtt==1.3.1
 pyserial==3.4
-python-dateutil==2.7.0
+python-dateutil==2.7.2
 pytz==2018.3
 requests==2.18.4
 urllib3==1.22
diff --git a/dsmrreader/provisioning/requirements/dev.txt b/dsmrreader/provisioning/requirements/dev.txt
@@ -1,4 +1,4 @@
-sphinx==1.7.1
+sphinx==1.7.2
 sphinx-autobuild==0.7.1
-sphinx-intl==0.9.10
+sphinx-intl==0.9.11
 sphinx-rtd-theme==0.2.4
diff --git a/dsmrreader/provisioning/requirements/travis.txt b/dsmrreader/provisioning/requirements/travis.txt
@@ -1,2 +1,2 @@
 # For some reason Travis needs to be forced installing this version, or the build pretend like it doesn't know 'pytest'.
-pytest==3.4.2
+pytest==3.5.0