Released 2.2.1

dennissiemensma · dennissiemensma · commit fbd4c0b736eb · 2019-07-03T18:23:31.000+02:00
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -15,6 +15,18 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 ----
 
 
+v2.2.1 - 2019-07-03
+^^^^^^^^^^^^^^^^^^^
+
+**Tickets resolved in this release:**
+
+- [`#665 <https://github.com/dennissiemensma/dsmr-reader/issues/665>`_] Django security releases issued: 2.2.3
+- [`#660 <https://github.com/dennissiemensma/dsmr-reader/issues/660>`_] Add a timeout to the datalogger web request - by Helmo
+
+
+----
+
+
 v2.2.0 - 2019-06-14
 ^^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/locale/nl/LC_MESSAGES/api.mo b/docs/locale/nl/LC_MESSAGES/api.mo
diff --git a/docs/locale/nl/LC_MESSAGES/application.mo b/docs/locale/nl/LC_MESSAGES/application.mo
diff --git a/docs/locale/nl/LC_MESSAGES/changelog.mo b/docs/locale/nl/LC_MESSAGES/changelog.mo
diff --git a/dsmr_datalogger/scripts/dsmr_datalogger_api_client.py b/dsmr_datalogger/scripts/dsmr_datalogger_api_client.py
@@ -97,6 +97,7 @@ def send_telegram(telegram, api_url, api_key):
         api_url,
         headers={'X-AUTHKEY': api_key},
         data={'telegram': telegram},
+        timeout=60,
     )
 
     # Old versions of DSMR-reader return 200, new ones 201.
diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py
@@ -16,6 +16,6 @@
 """
 from django.utils.version import get_version
 
-VERSION = (2, 2, 0, 'final', 0)
+VERSION = (2, 2, 1, 'final', 0)
 
 __version__ = get_version(VERSION)
diff --git a/dsmrreader/provisioning/requirements/base.txt b/dsmrreader/provisioning/requirements/base.txt
@@ -1,12 +1,12 @@
 crcmod==1.7
 coreapi==2.3.3
-django==2.2.2
+django==2.2.3
 django-colorfield==0.1.15
-django-debug-toolbar==1.11
+django-debug-toolbar==2.0
 django-filter==2.1.0
 djangorestframework==3.9.4
 django-solo==1.1.3
-dropbox==9.3.0
+dropbox==9.4.0
 gunicorn==19.9.0
 paho-mqtt==1.3.1
 pyserial==3.4
diff --git a/dsmrreader/provisioning/requirements/dev.txt b/dsmrreader/provisioning/requirements/dev.txt
@@ -1,5 +1,5 @@
 pylama==7.7.1
-sphinx==2.1.1
+sphinx==2.1.2
 sphinx-autobuild==0.7.1
 sphinx-intl==2.0.0
 sphinx-rtd-theme==0.4.3
diff --git a/dsmrreader/provisioning/requirements/postgresql.txt b/dsmrreader/provisioning/requirements/postgresql.txt
@@ -1,2 +1,2 @@
-psycopg2==2.8.2
-psycopg2-binary==2.8.2
+psycopg2==2.8.3
+psycopg2-binary==2.8.3
diff --git a/dsmrreader/provisioning/requirements/test.txt b/dsmrreader/provisioning/requirements/test.txt
@@ -1,4 +1,4 @@
 polib==1.1.0
 pytest-cov==2.7.1
-pytest-django==3.5.0
-pytest-xdist==1.28.0
+pytest-django==3.5.1
+pytest-xdist==1.29.0
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==4.6.3
+pytest==5.0.0

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ def send_telegram(telegram, api_url, api_key):`
`97`	`97`	`api_url,`
`98`	`98`	`headers={'X-AUTHKEY': api_key},`
`99`	`99`	`data={'telegram': telegram},`
	`100`	`+ timeout=60,`
`100`	`101`	`)`
`101`	`102`
`102`	`103`	`# Old versions of DSMR-reader return 200, new ones 201.`