From 9a069c7a839f59d0a2d95653c206742d3c6aadcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Tue, 5 May 2020 01:43:37 +0200
Subject: [PATCH] Upgrade Wagtail to v2.9 and other requirements too
---
majak/settings/base.py | 1 -
requirements/base.in | 2 +-
requirements/base.txt | 16 +++++++++-------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/majak/settings/base.py b/majak/settings/base.py
index 57e1ecad..cfd30cc3 100644
--- a/majak/settings/base.py
+++ b/majak/settings/base.py
@@ -49,7 +49,6 @@ MIDDLEWARE = [
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"django.middleware.security.SecurityMiddleware",
- "wagtail.core.middleware.SiteMiddleware",
"wagtail.contrib.redirects.middleware.RedirectMiddleware",
]
diff --git a/requirements/base.in b/requirements/base.in
index 54fb7179..cbd1f927 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -3,4 +3,4 @@ wagtailmenus
django-environ
django-extensions
psycopg2-binary
-git+https://gitlab.pirati.cz/to/pirates@v0.2.1
+git+https://gitlab.pirati.cz/to/pirates@v0.3.1
diff --git a/requirements/base.txt b/requirements/base.txt
index ed81bff7..3a794707 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -5,7 +5,7 @@
# pip-compile base.in
#
asgiref==3.2.7 # via django
-beautifulsoup4==4.6.0 # via wagtail
+beautifulsoup4==4.8.2 # via wagtail
certifi==2020.4.5.1 # via requests
cffi==1.14.0 # via cryptography
chardet==3.0.4 # via requests
@@ -16,7 +16,7 @@ django-extensions==2.2.9 # via -r base.in
django-modelcluster==5.0.1 # via wagtail
django-taggit==1.2.0 # via wagtail
django-treebeard==4.3.1 # via wagtail
-django==3.0.5 # via django-taggit, django-treebeard, djangorestframework, mozilla-django-oidc, wagtail
+django==3.0.6 # via django-taggit, django-treebeard, djangorestframework, mozilla-django-oidc, wagtail
djangorestframework==3.11.0 # via wagtail
draftjs-exporter==2.1.7 # via wagtail
html5lib==1.0.1 # via wagtail
@@ -24,24 +24,26 @@ idna==2.9 # via requests
josepy==1.3.0 # via mozilla-django-oidc
l18n==2018.5 # via wagtail
mozilla-django-oidc==1.2.3 # via pirates
-pillow==6.2.2 # via wagtail
-git+https://gitlab.pirati.cz/to/pirates@v0.2.1 # via -r base.in
+pillow==7.1.2 # via wagtail
+git+https://gitlab.pirati.cz/to/pirates@v0.3.1 # via -r base.in
psycopg2-binary==2.8.5 # via -r base.in
pyasn1-modules==0.2.8 # via python-ldap
pyasn1==0.4.8 # via pyasn1-modules, python-ldap
pycparser==2.20 # via cffi
pyopenssl==19.1.0 # via josepy
python-ldap==3.2.0 # via pirates
-pytz==2019.3 # via django, django-modelcluster, l18n
+pytz==2020.1 # via django, django-modelcluster, l18n
requests==2.23.0 # via mozilla-django-oidc, wagtail
six==1.14.0 # via cryptography, django-extensions, html5lib, josepy, l18n, mozilla-django-oidc, pyopenssl
+soupsieve==2.0 # via beautifulsoup4
sqlparse==0.3.1 # via django
unidecode==1.1.1 # via wagtail
-urllib3==1.25.8 # via requests
-wagtail==2.8.1 # via -r base.in
+urllib3==1.25.9 # via requests
+wagtail==2.9 # via -r base.in
wagtailmenus==3.0.1 # via -r base.in
webencodings==0.5.1 # via html5lib
willow==1.3 # via wagtail
+xlsxwriter==1.2.8 # via wagtail
# The following packages are considered to be unsafe in a requirements file:
# setuptools
--
GitLab