From 7e80bdf17403b5b0f195a68d178519463273700a Mon Sep 17 00:00:00 2001 From: Dennis Siemensma Date: Wed, 4 Apr 2018 15:53:31 +0200 Subject: [PATCH] Release v1.16.0 --- .github/ISSUE_TEMPLATE.md | 2 +- docs/application.rst | 3 +++ docs/changelog.rst | 12 ++++++++++++ docs/credits.rst | 11 ++++++++++- .../management/commands/development_reset.py | 2 +- dsmr_datalogger/services.py | 2 +- dsmr_datalogger/tests/datalogger/test_iskra.py | 2 +- dsmrreader/__init__.py | 2 +- dsmrreader/provisioning/nginx/dsmr-webinterface | 8 ++++++-- dsmrreader/provisioning/requirements/base.txt | 6 +++--- dsmrreader/provisioning/requirements/dev.txt | 4 ++-- dsmrreader/provisioning/requirements/travis.txt | 2 +- 12 files changed, 42 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index e5ceab298..581c60dd2 100644 --- 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 index 3af9c22e6..e4a827dc5 100644 --- 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 index 457ff8a41..ed42d42a8 100644 --- 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 `_] DSMR v2.x parse-fout - by mrvanes +- [`#455 `_] DOCS: Handleiding Nginx authenticatie uitbreiden - by FutureCow +- [`#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 index b0e9ee9e9..84341b04e 100644 --- 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 `_ - `balk77 `_ +- `Baseje `_ - `Bert-Jan Vos `_ +- `Calimerorulez `_ - `dajappie `_ - `Daniel ter Horst `_ - `dbmnl `_ - `emilkwaaitaal `_ +- `Ernst79 `_ +- `f0nt4 `_ - `fpompert `_ +- `FutureCow `_ - `Gert Schaafsma `_ - `gertjuhh `_ - `goegol `_ @@ -28,8 +33,10 @@ Listed in any order, sorted by name. - `HugoDaBosss `_ - `Jelte Leijenaar `_ - `Jeroen Tielen `_ +- `joopy `_ - `Joris Vervuurt `_ - `ju5t `_ +- `jwveldhuis `_ - Koen Volleberg - `lckarssen `_ - `MarsWarrior `_ @@ -37,9 +44,11 @@ Listed in any order, sorted by name. - `meijjaa `_ - `michielvisser `_ - `mkruiver `_ +- `mrvanes `_ - `Paul Vinken `_ - `perryodk `_ - `pyrocumulus `_ +- `raoulteeuwen `_ - `Sander de Leeuw `_ - `Sevickson `_ - `ThinkPadNL `_ diff --git a/dsmr_backend/management/commands/development_reset.py b/dsmr_backend/management/commands/development_reset.py index 81958c1d5..18f9d4a8b 100644 --- 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 index 7fa3cfc97..c0ee9e608 100644 --- 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 index 051e77a75..05a708d28 100644 --- 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 index feaba6490..c883e1126 100644 --- 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 index aa56bc3ec..03ba148fd 100644 --- 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 index eefeeeb54..04f430f7b 100644 --- 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 index 350e222b3..365b3e086 100644 --- 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 index ffcf03a21..b77778bac 100644 --- 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