Released 2.0.0

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,3 @@
-LET OP: Wegens verminderde beschikbaarheid tot aan medio april 2019,
-        kan het zijn dat de auteur minder snel of helemaal niet in de
-        gelegenheid is om te reageren. Zie ook issue #576.
-----
-
 ### Jouw omgeving
 *(Indien van toepassing)*
 * DSMR-reader versie *(rechtsbovenin applicatie zichtbaar)*: `v1.X.Y`

.travis.yml

@@ -2,7 +2,6 @@ language: python
 
 # https://docs.travis-ci.com/user/languages/python/
 python:
-  - 3.4
   - 3.5
   - 3.6
   - 3.5-dev
@@ -24,7 +23,8 @@ addons:
   postgresql: "9.4"
 
 env:
-  - DB=sqlite DJANGO_SETTINGS_MODULE='dsmrreader.config.travis.sqlite'
+### Disabled until Travis upgrades SQLite.
+###  - DB=sqlite DJANGO_SETTINGS_MODULE='dsmrreader.config.travis.sqlite'
   - DB=mysql DJANGO_SETTINGS_MODULE='dsmrreader.config.travis.mysql'
   - DB=postgresql DJANGO_SETTINGS_MODULE='dsmrreader.config.travis.postgresql'
 

docs/changelog.rst

@@ -17,6 +17,28 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 ----
 
 
+
+v2.0.0 - 2019-04-16
+^^^^^^^^^^^^^^^^^^^^
+
+.. warning:: **Change in Python support** 
+
+  - The support for ``Python 3.4`` has been **dropped** due to the Django upgrade (`#512 <https://github.com/dennissiemensma/dsmr-reader/issues/512>`.
+
+
+**Tickets resolved in this release:**
+
+
+- [`#512 <https://github.com/dennissiemensma/dsmr-reader/issues/512>`_] Drop support for Python 3.4
+- [`#510 <https://github.com/dennissiemensma/dsmr-reader/issues/510>`_] Django 2.1 released
+- [`#616 <https://github.com/dennissiemensma/dsmr-reader/issues/616>`_] Requirements update (April 2019)
+- [`#596 <https://github.com/dennissiemensma/dsmr-reader/issues/596>`_] Update django to 2.0.13 - by Timdebruijn
+- [`#580 <https://github.com/dennissiemensma/dsmr-reader/issues/580>`_] Django security releases issued: 2.0.10 - by mjanssens
+
+
+----
+
+
 v1.28.0 - 2019-01-04
 ^^^^^^^^^^^^^^^^^^^^
 

docs/credits.rst

@@ -47,6 +47,7 @@ Listed in any order, sorted by name.
 - `mbnn <https://github.com/mbnn>`_
 - `meijjaa <https://github.com/meijjaa>`_
 - `michielvisser <https://github.com/michielvisser>`_
+- `mjanssens <https://github.com/mjanssens>`_
 - `mkruiver <https://github.com/mkruiver>`_
 - `mrvanes <https://github.com/mrvanes>`_ 
 - `Oliver Payne <https://github.com/olipayne>`_ 
@@ -64,6 +65,7 @@ Listed in any order, sorted by name.
 - `ThinkPadNL <https://github.com/ThinkPadNL>`_
 - `thommy101 <https://github.com/thommy101>`_
 - Tijs van Noije
+- `Timdebruijn <https://github.com/Timdebruijn>`_
 - `TopdRob <https://github.com/TopdRob>`_
 - `tpjanssen <https://github.com/tpjanssen>`_
 - `trbs <https://github.com/trbs>`_

dsmr_api/tests/v2/test_generic.py

@@ -34,6 +34,9 @@ def app(self):
 
     def test_user_does_not_exist(self):
         """ Tests what happens when the API user was not created. """
+        if connection.vendor == 'sqlite':  # pragma: no cover
+            return self.skipTest(reason='SQLite cannot be used while foreign key constraint checks are enabled')
+
         # Roll back migration creating the API user.
         MigrationExecutor(connection=connection).migrate([(self.app, '0002_generate_random_auth_key')])
 

dsmr_consumption/services.py

@@ -302,7 +302,7 @@ def live_electricity_consumption(use_naturaltime=True):
     data['currently_returned'] = int(latest_reading.electricity_currently_returned * 1000)
 
     if use_naturaltime:
-        data['timestamp'] = naturaltime(data['timestamp'])
+        data['timestamp'] = str(naturaltime(data['timestamp']))
 
     try:
         # This WILL fail when we either have no prices at all or conflicting ranges.
@@ -327,7 +327,6 @@ def live_electricity_consumption(use_naturaltime=True):
         data['cost_per_hour'] = formats.number_format(
             round_decimal(cost_per_hour)
         )
-
     return data
 
 

dsmr_frontend/tests/regression/test_renamed_docs_reverse_url.py

@@ -23,6 +23,9 @@ def setUp(self):
 
     def test_no_reverse_match_docs(self):
         """ Test whether the docs URL in old notfications are converted to their new location. """
+        if connection.vendor == 'sqlite':  # pragma: no cover
+            return self.skipTest(reason='SQLite cannot be used while foreign key constraint checks are enabled')
+
         Notification.objects.create(
             message='Fake',
             redirect_to='frontend:docs',  # Non-existing legacy.

dsmr_frontend/tests/webinterface/test_dashboard.py

@@ -5,7 +5,6 @@
 from django.utils import timezone
 from django.urls import reverse
 from django.contrib.auth.models import User
-from django.db.models import F
 
 from dsmr_consumption.models.consumption import ElectricityConsumption, GasConsumption
 from dsmr_consumption.models.energysupplier import EnergySupplierPrice
@@ -90,7 +89,7 @@ def test_dashboard_xhr_header(self, now_mock):
 
     def test_dashboard_xhr_header_future(self):
         # Set timestamp to the future, so the view will reset the timestamp displayed to 'now'.
-        DsmrReading.objects.all().update(timestamp=F('timestamp') + timezone.timedelta(weeks=999))
+        DsmrReading.objects.all().update(timestamp=timezone.now() + timezone.timedelta(weeks=1))
 
         response = self.client.get(
             reverse('{}:dashboard-xhr-header'.format(self.namespace))

dsmr_weather/tests/regression/test_next_sync_setting_retroactive.py

@@ -21,6 +21,9 @@ def app(self):
 
     def test_next_sync_setting_retroactive(self):
         """ Test whether the migration can also handle existing data. """
+        if connection.vendor == 'sqlite':  # pragma: no cover
+            return self.skipTest(reason='SQLite cannot be used while foreign key constraint checks are enabled')
+
         now = timezone.now().replace(microsecond=0)
 
         TemperatureReading.objects.create(

dsmrreader/__init__.py

@@ -17,6 +17,6 @@
 from django.utils.version import get_version
 
 
-VERSION = (1, 28, 0, 'final', 0)
+VERSION = (2, 0, 0, 'final', 0)
 
 __version__ = get_version(VERSION)

dsmrreader/provisioning/requirements/base.txt

@@ -1,16 +1,16 @@
 crcmod==1.7
 coreapi==2.3.3
-django==2.0.9
+django==2.2
 django-colorfield==0.1.15
 django-debug-toolbar==1.11
-django-filter==2.0.0
-djangorestframework==3.9.0
+django-filter==2.1.0
+djangorestframework==3.9.2
 django-solo==1.1.3
 dropbox==9.3.0
 gunicorn==19.9.0
 paho-mqtt==1.3.1
 pyserial==3.4
-python-dateutil==2.7.5
-pytz==2018.7
+python-dateutil==2.8.0
+pytz==2019.1
 requests==2.21.0
 urllib3==1.24.1

dsmrreader/provisioning/requirements/dev.txt

@@ -1,4 +1,4 @@
-sphinx==1.8.3
+sphinx==2.0.1
 sphinx-autobuild==0.7.1
 sphinx-intl==0.9.11
-sphinx-rtd-theme==0.4.2
+sphinx-rtd-theme==0.4.3

dsmrreader/provisioning/requirements/mysql.txt

@@ -1 +1 @@
-mysqlclient==1.3.14
+mysqlclient==1.4.2.post1

dsmrreader/provisioning/requirements/postgresql.txt

@@ -1,2 +1,2 @@
-psycopg2==2.7.6.1
-psycopg2-binary==2.7.6.1
+psycopg2==2.8.2
+psycopg2-binary==2.8.2

dsmrreader/provisioning/requirements/test.txt

@@ -1,5 +1,5 @@
 polib==1.1.0
-pylama==7.6.6 ; python_version < '3.7' # Re-check since project seems alive again?
-pytest-cov==2.6.0
-pytest-django==3.4.4
-pytest-xdist==1.25.0
+pylama==7.7.1 ; python_version < '3.7' # Re-check since project seems alive again?
+pytest-cov==2.6.1
+pytest-django==3.4.8
+pytest-xdist==1.28.0

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.0.2
+pytest==4.4.0