From 9731f0a95295841e72813d0c54645c8e13eed42d Mon Sep 17 00:00:00 2001
From: Dennis Siemensma <github@dennissiemensma.nl>
Date: Mon, 15 Jun 2020 21:13:25 +0200
Subject: [PATCH] Django security update #1023

---
 docs/changelog.rst                            |   7 +++++++
 docs/locale/nl/LC_MESSAGES/changelog.mo       | Bin 349 -> 309 bytes
 docs/locale/nl/LC_MESSAGES/credits.po         |   2 --
 docs/locale/nl/LC_MESSAGES/data_integrity.mo  | Bin 4537 -> 4497 bytes
 .../nl/LC_MESSAGES/installation/docker.mo     | Bin 1842 -> 1802 bytes
 docs/locale/nl/LC_MESSAGES/intro.mo           | Bin 2118 -> 2078 bytes
 docs/locale/nl/LC_MESSAGES/troubleshooting.mo | Bin 6266 -> 6226 bytes
 dsmrreader/__init__.py                        |   2 +-
 dsmrreader/provisioning/downgrade/v3.10.1.sh  |  15 +++++++++++++++
 dsmrreader/provisioning/requirements/base.txt |   6 +++---
 dsmrreader/provisioning/requirements/dev.txt  |   4 ++--
 11 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 dsmrreader/provisioning/downgrade/v3.10.1.sh

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 <https://github.com/dennissiemensma/dsmr-reader/issues/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 bde1bebd76c74158266c3be4a577c95ad8d6e43a..acc163bf9e3a050edfbfe8e374c530fcc7b6cc0a 100644
GIT binary patch
delta 15
Xcmcc1w3TUs3e#_fiE7>xXC46nF5(6_

delta 55
zcmdnWbeCy@3X?M9L^W^q0Ds+})UwRt%=|oEm&B4(D}_i`#~@u_e_a<x1rL8KUr+5Q
Ke?QlW1xEqY)e#y1

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 d2408722822cc19c9be492e9e4519a8dc0dd92c0..3a225cfd777a5d7d736c9ce238b36fb87f5a7096 100644
GIT binary patch
delta 144
zcmdm~JW+YVlzMqa1_pf&28LV)1_pml1_mILVK0zo1&SX7(j7ql87>9}ejpvn&A=cF
z6i)@xKq-c19thnFq!WPr=|Fltkp2Or`GE8aUIvC(p!)4V+6qXE0u6Bh(g6Yt3_uE`
PX0tG3F#F~{4sA{VUZD}t

delta 184
zcmbQJyi<9?lzMkY1_pf&28LV)28MD@1_mIL;VF=21&Y4|(j7ql7cK?{ejr`T&A=cF
z6z>JnKq-dRJP>*-kWK*d_XFwmKw5#9fq@T5UjWjvK=t>5v=xxH1sdW2q$>m%7=RQ=
z&1PZ7V0QHYf8C(evdrSl{5)Nk#FA7i1tS9^16>1CT_XzxBO@zQLv0}6U~?*m4krM@
CrX5BA

diff --git a/docs/locale/nl/LC_MESSAGES/installation/docker.mo b/docs/locale/nl/LC_MESSAGES/installation/docker.mo
index 8ca7ae0b7a5e8f7830ef0d978f1afcf6ad187629..14a523fc235448e5e7fda7da845486063b6a1d25 100644
GIT binary patch
delta 144
zcmdnQ*TpwsPQ3vm1H(LK1_pZu28Q!23=C{QnxB<{ffq=N0clYntpcP)fV35m<^t0G
zKpLbj3P=kB=|mts14x%b`Fuc0Ss-5tNb3V>2OzBrqzizw8IYa_q)mYIRW^pr(u}8>
KHuJHlFarPp%nkkk

delta 184
zcmeC;+r&3vPJIL;1H(LK1_pZu28Qn}3=C{Q+MJbvffq>I0clYn?E|DmfOHa&<^s~?
zKpLd32}lbA=}sU$14z$>^38yfvOvBUkk$v%89-VWNY4P$W<dHFkTwC*f7uu|OEaEk
xQV;Og4N5J`EY8f&({)KKNwrciGB7gGH89mRvQRKGvNAQ+2J#IyKV?>B1^`Q_8=L?D

diff --git a/docs/locale/nl/LC_MESSAGES/intro.mo b/docs/locale/nl/LC_MESSAGES/intro.mo
index cd5be4b2d16d62746d316684bc81110a5dae82a3..f3575ecc5cf71253b933f7b406c75be06adb1d2d 100644
GIT binary patch
delta 144
zcmX>mFi&7YPyJ#>28JEX3=HlJ3=A=>3=AGXdI^v&2hwkWG#8LgWn*9fB8CDW!40I#
zfizHxp&3Z?0_jd5oe!j^L*?1o85l%>d|@Ch45T%H^g|$R1Ehi0fz9Fo(m=hNxfunR
KH#@U1vj6}&R}Rbo

delta 184
zcmbOya7<uAPyJ~|28JEX3=HlJ3=A!-3=AGX`V5dR2hyT!3=CXAx)(?T5yK21!40J6
z18JZVhSflt7f5de()mDoKU7|yoq<6F$hQX4!azCzNIwM9DL@)%9oQ@mAPv;JnVV67
xSv|mCHz>6%vp6$9PuC@}B-Kj6$iT=z*T7WQ$U?!$$ja1E8^|}<EXBgY0s!{C8X5oq

diff --git a/docs/locale/nl/LC_MESSAGES/troubleshooting.mo b/docs/locale/nl/LC_MESSAGES/troubleshooting.mo
index 036b1757d1e7dbcda3f7c7f059b3032e88878a1f..19cc8e5d495dc4ba8aa1c68e8c05dc6415d21b15 100644
GIT binary patch
delta 361
zcmXZXuS<hb6o>I=1}B?yPPZw{ASycC9D^0Z&|nn&k+g_S#Fd4CVi}msHiL+08J59Y
z6r1U_`X^Ydg0LV6J{L@%bMN7v?>#^D_j<pR=*}l#Bm-@rItIgfqZj(1d0ooFkv27{
z_y0a>&2yxV;6tDEORu#z4k_Kpfuq>cTRqSh{ms#3*W!5sW;8ts>sr<jbgZG@)&+gl
zHT~38UG#TlJ=80`)DT!Iz+LF;iN+e<H;P~s`#P$v;vQ^UoO!XVv4)MlH4L7cf{JeH
fj-Kj@#_Dnm)W49NhFLACSu~@!q4QMK%4E}jI6Em5

delta 401
zcmXZX&nv@m9LMq39MG59%*=}PJrG%6K7F)WJ5c6C*_V`qliJiM)Yc9zTS~6t!fE^m
zt6h|{gSg=6<m$AuljkQ+kN5lY<Nf2^{Frtv(pZm3{ZZ*e()N(li%)olub9MQOxnj1
z_TkIFA2?6`iIk8RmmV;UxA=x09u7;CQXN}(j*mE<P(zypUkPaf7e}OJ4AC{ZM0bCK
zQ}~Tb7-Om&Zs06l;1#yfH7txu_wF7Ku#4{hZc3t+nmCBpsU5Z>xZ_|ByXZC=ANwo3
zh8glIhS<Wuy+fAMWLjb-EufDDq?bya=blq<CM*V9<$9%BIX((j_iE+5Z;ds9$p$v(
PTbs|?47us7MB@X$O&&Av

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