[geany/www.geany.org] 293e7e: Upgrade Django to 2.2

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sun, 03 May 2020 17:33:11 UTC
Commit:      293e7ebbdbd43298877fd0ddae62e360e12d8ba7
             https://github.com/geany/www.geany.org/commit/293e7ebbdbd43298877fd0ddae62e360e12d8ba7

Log Message:
-----------
Upgrade Django to 2.2

For Django 2.2 support we need patched versions of Mezzanine and
mezzanine-pagedown.


Modified Paths:
--------------
    geany/settings.py
    requirements.txt

Modified: geany/settings.py
8 lines changed, 7 insertions(+), 1 deletions(-)
===================================================================
@@ -302,6 +302,7 @@
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
+    "django.contrib.messages",
     "django.contrib.redirects",
     "django.contrib.sessions",
     "django.contrib.sites",
@@ -564,6 +565,11 @@ def skip_404_not_found(record):
             'level': 'INFO',
             'propagate': True,
         },
+        'django.utils.autoreload': {
+            'handlers': [],
+            'level': 'INFO',
+            'propagate': True,
+        },
         'MARKDOWN': {
             'handlers': [],
             'level': 'INFO',
@@ -595,7 +601,7 @@ def skip_404_not_found(record):
     message='^mezzanine_pagedown.filters.custom needs to ensure that any untrusted inputs.*',
     category=FutureWarning,
     module='mezzanine.core.templatetags.mezzanine_tags',
-    lineno=488)
+    lineno=481)
 
 ##################
 # LOCAL SETTINGS #


Modified: requirements.txt
15 lines changed, 9 insertions(+), 6 deletions(-)
===================================================================
@@ -1,12 +1,11 @@
-Django<2.1
+Django<3.0,>=2.2
 babel
 mysqlclient
 django-compressor
 django-extensions
 django-honeypot
 django-link-shortener
 django-log-request-id
-mezzanine-pagedown
 mezzanine-sync-pages
 packaging
 pygments
@@ -21,7 +20,11 @@ uwsgi
 django-debug-toolbar
 
 # Mezzanine from GIT
-# https://github.com/stephenmcd/mezzanine/issues/1899
-git+https://github.com/stephenmcd/filebrowser-safe.git
-git+https://github.com/stephenmcd/grappelli-safe.git
-git+https://github.com/eht16/mezzanine.git@issue1899_keyword_update_with_django2_0#egg=mezzanine
+# https://github.com/stephenmcd/mezzanine/pull/1956
+git+https://github.com/fermorltd/filebrowser-safe.git@2.2-compat#egg=filebrowser-safe
+git+https://github.com/fermorltd/grappelli-safe.git@2.2-compat#egg=grappelli-safe
+git+https://github.com/fermorltd/mezzanine.git@2.2-compat#egg=mezzanine
+
+# mezzanine-pagedown from GIT with Django >= 2.1 fix
+# https://github.com/akhayyat/mezzanine-pagedown/pull/1
+git+https://github.com/eht16/mezzanine-pagedown.git@django-2.1#egg=mezzanine-pagedown



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).