diff --git a/docs/changelog.rst b/docs/changelog.rst index 21613c2f8..2a0b95cf2 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,13 @@ Changelog ========= +v3.10.1 - 2020-06-15 + +- [`#1023 `_] Django security update + + +---- + v3.10.0 - 2020-05-29 diff --git a/docs/locale/nl/LC_MESSAGES/changelog.mo b/docs/locale/nl/LC_MESSAGES/changelog.mo index bde1bebd7..acc163bf9 100644 Binary files a/docs/locale/nl/LC_MESSAGES/changelog.mo and b/docs/locale/nl/LC_MESSAGES/changelog.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/credits.po b/docs/locale/nl/LC_MESSAGES/credits.po index 3257f2f3c..c357c9506 100644 --- a/docs/locale/nl/LC_MESSAGES/credits.po +++ b/docs/locale/nl/LC_MESSAGES/credits.po @@ -16,8 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.8.0\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" "X-Generator: Poedit 2.0.6\n" #: ../../credits.rst:2 diff --git a/docs/locale/nl/LC_MESSAGES/data_integrity.mo b/docs/locale/nl/LC_MESSAGES/data_integrity.mo index d24087228..3a225cfd7 100644 Binary files a/docs/locale/nl/LC_MESSAGES/data_integrity.mo and b/docs/locale/nl/LC_MESSAGES/data_integrity.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/installation/docker.mo b/docs/locale/nl/LC_MESSAGES/installation/docker.mo index 8ca7ae0b7..14a523fc2 100644 Binary files a/docs/locale/nl/LC_MESSAGES/installation/docker.mo and b/docs/locale/nl/LC_MESSAGES/installation/docker.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/intro.mo b/docs/locale/nl/LC_MESSAGES/intro.mo index cd5be4b2d..f3575ecc5 100644 Binary files a/docs/locale/nl/LC_MESSAGES/intro.mo and b/docs/locale/nl/LC_MESSAGES/intro.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/troubleshooting.mo b/docs/locale/nl/LC_MESSAGES/troubleshooting.mo index 036b1757d..19cc8e5d4 100644 Binary files a/docs/locale/nl/LC_MESSAGES/troubleshooting.mo and b/docs/locale/nl/LC_MESSAGES/troubleshooting.mo differ diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py index dd67b755a..c7229bf3e 100644 --- a/dsmrreader/__init__.py +++ b/dsmrreader/__init__.py @@ -1,5 +1,5 @@ from django.utils.version import get_version -VERSION = (3, 10, 0, 'final', 0) +VERSION = (3, 10, 1, 'final', 0) __version__ = get_version(VERSION) diff --git a/dsmrreader/provisioning/downgrade/v3.10.1.sh b/dsmrreader/provisioning/downgrade/v3.10.1.sh new file mode 100644 index 000000000..fb03e04e4 --- /dev/null +++ b/dsmrreader/provisioning/downgrade/v3.10.1.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Dump for DSMR-reader v3.10.1 +./manage.py migrate dsmr_api 0003_create_api_user +./manage.py migrate dsmr_backend 0014_verbose_field_translations +./manage.py migrate dsmr_backup 0011_remove_backupsettings_latest_backup +./manage.py migrate dsmr_consumption 0015_track_power_current +./manage.py migrate dsmr_datalogger 0022_three_month_retention +./manage.py migrate dsmr_frontend 0036_graphs_zoom +./manage.py migrate dsmr_mindergas 0005_schedule_mindergas_export +./manage.py migrate dsmr_mqtt 0014_mqtt_telegram_defaults +./manage.py migrate dsmr_notification 0007_support_for_telegram +./manage.py migrate dsmr_pvoutput 0002_pvoutput_latest_sync +./manage.py migrate dsmr_stats 0014_day_total_cost_index +./manage.py migrate dsmr_weather 0006_schedule_weather_update diff --git a/dsmrreader/provisioning/requirements/base.txt b/dsmrreader/provisioning/requirements/base.txt index d1d842bb0..1de054ff5 100644 --- a/dsmrreader/provisioning/requirements/base.txt +++ b/dsmrreader/provisioning/requirements/base.txt @@ -1,10 +1,10 @@ coreapi==2.3.3 crcmod==1.7 -django==3.0.6 -django-admin-rangefilter==0.6.0 +django==3.0.7 +django-admin-rangefilter==0.6.1 django-colorfield==0.3.0 django-debug-toolbar==2.2 -django-filter==2.2.0 +django-filter==2.3.0 djangorestframework==3.11 django-solo==1.1.3 dropbox==10.2.0 diff --git a/dsmrreader/provisioning/requirements/dev.txt b/dsmrreader/provisioning/requirements/dev.txt index f4f590762..685fede71 100644 --- a/dsmrreader/provisioning/requirements/dev.txt +++ b/dsmrreader/provisioning/requirements/dev.txt @@ -1,9 +1,9 @@ polib==1.1.0 pylama==7.7.1 -pytest-cov==2.9.0 +pytest-cov==2.10.0 pytest-django==3.9.0 pytest-xdist==1.32.0 -sphinx==3.0.4 +sphinx==3.1.1 sphinx-autobuild==0.7.1 sphinx-intl==2.0.1 sphinx-rtd-theme==0.4.3