Bump packages, Django 2.2.28 security advisory

Author: vdboor

src/Makefile

@@ -12,7 +12,7 @@ sync:
 	pip-sync requirements/dev.txt requirements/base.txt
 
 upgrade:
-	pur --patch=Django -r requirements/base.in
+	pur --patch=Django,django-tinymce -r requirements/base.in
 	pur --no-recursive -r requirements/docker.txt
 	pur --no-recursive -r requirements/dev.txt
 	pip-compile -v --upgrade --output-file requirements/base.txt requirements/base.in

src/fluentdemo/urls.py

@@ -46,8 +46,8 @@
     # e.g. /nl/... or /en/....
 
     # Django admin
-    url(r'^admin/', admin.site.urls),
     url(r'^admin/filebrowser/', fb_site.urls),
+    url(r'^admin/', admin.site.urls),
     url(r'^admin/util/tags/', include(taggit_selectize.urls)),
     url(r'^admin/util/tinymce/', include(tinymce.urls)),
     url(r'^admin/util/tools/', include(admin_tools.urls)),

src/requirements/base.in

@@ -1,21 +1,20 @@
 # Install with: `pip install -r requirements/base.txt`
 
 # Infrastructure
-Django == 2.2.26
-Pillow == 9.0.0
+Django == 2.2.28
+Pillow == 9.1.0
 psycopg2 == 2.9.3
-python-memcached == 1.59
-sentry-sdk ==  1.5.1
+sentry-sdk ==  1.5.9
 uWSGI == 2.0.20
 WsgiUnproxy == 1.0
 
 # CMS libraries
-django-fluent-blogs == 3.0
+django-fluent-blogs == 3.0.2
 django-fluent-comments == 3.0
 django-fluent-contents[code,markup,oembeditem,text] == 3.0
 django-fluent-dashboard == 2.0
 django-fluent-pages == 3.0
-django-fluent-utils >= 3.0.1
+django-fluent-utils == 3.0.1
 
 # CMS Plugins
 fluentcms-button == 3.0
@@ -36,30 +35,30 @@ fluentcms-twitterfeed == 1.0.3
 future == 0.18.2
 
 # Support libs
-brotlipy >= 0.7.0
+brotlipy == 0.7.0
 django-admin-tools == 0.9.2
-django-analytical == 3.0.0
+django-analytical == 3.1.0
 django-any-imagefield == 1.1
 django-any-urlfield == 2.7.post1
 django-axes == 5.27.0
 django-categories-i18n == 2.0
-django-contrib-comments == 2.1.0
-django-crispy-forms == 1.13.0
+django-contrib-comments == 2.2.0
+django-crispy-forms == 1.14.0
 django-environ == 0.8.1
-django-filebrowser-no-grappelli == 3.8.0
+django-filebrowser-no-grappelli == 4.0.1
 django-gravatar2 == 1.4.4
 django-healthchecks == 1.4.2
 django-mptt == 0.13.4
 django-parler == 2.3
-django-phonenumber-field == 6.0.0
+django-phonenumber-field == 6.1.0
 django-polymorphic == 3.1.0
 django-polymorphic-tree == 2.1
 django-redis == 5.2.0
-django-simple-captcha == 0.5.14
-django-slug-preview == 2.0
+django-simple-captcha == 0.5.17
+django-slug-preview == 2.0.1
 django-staff-toolbar == 2.0
 django-tag-parser == 3.2
-django-taggit == 2.0.0
+django-taggit == 2.1.0
 django-threadedcomments == 2.0
 django-tinymce == 2.9.0
 django-webmaster-verification == 0.3.0
@@ -69,25 +68,23 @@ html5lib == 1.1
 Markdown == 3.3.6
 micawber == 0.5.4
 netaddr == 0.8.0
-pytz == 2021.3
-redis == 4.1.0
+pytz == 2022.1
+redis == 4.2.2
 smartypants == 2.0.1
-sorl-thumbnail == 12.7.0
+sorl-thumbnail == 12.8.0
 taggit-selectize == 2.11.0
-whitenoise == 5.3.0
+whitenoise == 6.0.0
 xlwt == 1.3.0
 
 # Installed dependencies
-django-template-analyzer >= 2.0
-phonenumberslite >= 8.12.40
-python-akismet >= 0.4.2
+django-template-analyzer == 2.0
+phonenumberslite == 8.12.46
+python-akismet == 0.4.3
 
-# Testing
-mock == 4.0.3
-coverage == 6.2
-
-# Pytest
-pytest == 6.2.5
+# Testrunner
+pytest == 7.1.1
 pytest-django == 4.5.2
 pytest-cov == 3.0.0
 pytest-sugar == 0.9.4
+coverage == 6.3.2
+mock == 4.0.3

src/requirements/base.txt

@@ -4,9 +4,11 @@
 #
 #    pip-compile --output-file=requirements/base.txt requirements/base.in
 #
+async-timeout==4.0.2
+    # via redis
 attrs==21.4.0
     # via pytest
-beautifulsoup4==4.10.0
+beautifulsoup4==4.11.1
     # via
     #   django-fluent-contents
     #   fluentcms-emailtemplates
@@ -18,21 +20,22 @@ certifi==2021.10.8
     #   sentry-sdk
 cffi==1.15.0
     # via brotlipy
-charset-normalizer==2.0.10
+charset-normalizer==2.0.12
     # via requests
-coverage[toml]==6.2
+coverage[toml]==6.3.2
     # via
     #   -r requirements/base.in
     #   pytest-cov
 deprecated==1.2.13
     # via redis
-django==2.2.26
+django==2.2.28
     # via
     #   -r requirements/base.in
     #   django-appconf
     #   django-axes
     #   django-contrib-comments
     #   django-healthchecks
+    #   django-js-asset
     #   django-parler
     #   django-phonenumber-field
     #   django-polymorphic
@@ -45,7 +48,7 @@ django-admin-tools==0.9.2
     # via
     #   -r requirements/base.in
     #   django-fluent-dashboard
-django-analytical==3.0.0
+django-analytical==3.1.0
     # via -r requirements/base.in
 django-any-imagefield==1.1
     # via -r requirements/base.in
@@ -59,21 +62,21 @@ django-categories-i18n==2.0
     # via
     #   -r requirements/base.in
     #   django-fluent-blogs
-django-contrib-comments==2.1.0
+django-contrib-comments==2.2.0
     # via
     #   -r requirements/base.in
     #   django-fluent-comments
     #   django-threadedcomments
-django-crispy-forms==1.13.0
+django-crispy-forms==1.14.0
     # via
     #   -r requirements/base.in
     #   django-fluent-comments
     #   fluentcms-contactform
 django-environ==0.8.1
     # via -r requirements/base.in
-django-filebrowser-no-grappelli==3.8.0
+django-filebrowser-no-grappelli==4.0.1
     # via -r requirements/base.in
-django-fluent-blogs==3.0
+django-fluent-blogs==3.0.2
     # via -r requirements/base.in
 django-fluent-comments==3.0
     # via -r requirements/base.in
@@ -113,7 +116,7 @@ django-healthchecks==1.4.2
     # via -r requirements/base.in
 django-ipware==4.0.2
     # via django-axes
-django-js-asset==1.2.2
+django-js-asset==2.0.0
     # via django-mptt
 django-mptt==0.13.4
     # via
@@ -129,7 +132,7 @@ django-parler==2.3
     #   django-fluent-contents
     #   django-fluent-pages
     #   fluentcms-emailtemplates
-django-phonenumber-field==6.0.0
+django-phonenumber-field==6.1.0
     # via
     #   -r requirements/base.in
     #   fluentcms-contactform
@@ -147,9 +150,9 @@ django-ranged-response==0.2.0
     # via django-simple-captcha
 django-redis==5.2.0
     # via -r requirements/base.in
-django-simple-captcha==0.5.14
+django-simple-captcha==0.5.17
     # via -r requirements/base.in
-django-slug-preview==2.0
+django-slug-preview==2.0.1
     # via
     #   -r requirements/base.in
     #   django-fluent-blogs
@@ -164,7 +167,7 @@ django-tag-parser==3.2
     #   django-fluent-contents
     #   django-fluent-pages
     #   django-polymorphic-tree
-django-taggit==2.0.0
+django-taggit==2.1.0
     # via -r requirements/base.in
 django-template-analyzer==2.0
     # via
@@ -226,7 +229,7 @@ html5lib==1.1
     #   textile
 idna==3.3
     # via requests
-importlib-metadata==4.10.0
+importlib-metadata==4.11.3
     # via
     #   markdown
     #   pluggy
@@ -251,9 +254,9 @@ packaging==21.3
     #   pytest
     #   pytest-sugar
     #   redis
-phonenumberslite==8.12.40
+phonenumberslite==8.12.46
     # via -r requirements/base.in
-pillow==9.0.0
+pillow==9.1.0
     # via
     #   -r requirements/base.in
     #   django-fluent-pages
@@ -268,9 +271,9 @@ pycparser==2.21
     # via cffi
 pygments==2.11.2
     # via django-fluent-contents
-pyparsing==3.0.6
+pyparsing==3.0.8
     # via packaging
-pytest==6.2.5
+pytest==7.1.1
     # via
     #   -r requirements/base.in
     #   pytest-cov
@@ -282,40 +285,36 @@ pytest-django==4.5.2
     # via -r requirements/base.in
 pytest-sugar==0.9.4
     # via -r requirements/base.in
-python-akismet==0.4.2
+python-akismet==0.4.3
     # via
     #   -r requirements/base.in
     #   django-fluent-comments
-python-memcached==1.59
-    # via -r requirements/base.in
-pytz==2021.3
+pytz==2022.1
     # via
     #   -r requirements/base.in
     #   django
-redis==4.1.0
+redis==4.2.2
     # via
     #   -r requirements/base.in
     #   django-redis
-regex==2021.11.10
+regex==2022.3.15
     # via textile
 requests==2.27.1
     # via
     #   django-healthchecks
     #   python-akismet
-sentry-sdk==1.5.1
+sentry-sdk==1.5.9
     # via -r requirements/base.in
 six==1.16.0
     # via
     #   django-filebrowser-no-grappelli
     #   django-healthchecks
-    #   django-simple-captcha
     #   html5lib
-    #   python-memcached
 smartypants==2.0.1
     # via -r requirements/base.in
-sorl-thumbnail==12.7.0
+sorl-thumbnail==12.8.0
     # via -r requirements/base.in
-soupsieve==2.3.1
+soupsieve==2.3.2
     # via beautifulsoup4
 sqlparse==0.4.2
     # via django
@@ -325,33 +324,36 @@ termcolor==1.1.0
     # via pytest-sugar
 textile==4.0.2
     # via django-fluent-contents
-toml==0.10.2
-    # via pytest
-tomli==2.0.0
-    # via coverage
+tomli==2.0.1
+    # via
+    #   coverage
+    #   pytest
 twitter-text==3.0
     # via fluentcms-twitterfeed
-typing-extensions==4.0.1
-    # via importlib-metadata
+typing-extensions==4.1.1
+    # via
+    #   async-timeout
+    #   importlib-metadata
+    #   redis
 unicodecsv==0.14.1
     # via fluentcms-googlemaps
-urllib3==1.26.7
+urllib3==1.26.9
     # via
     #   requests
     #   sentry-sdk
 uwsgi==2.0.20
     # via -r requirements/base.in
 webencodings==0.5.1
     # via html5lib
-whitenoise==5.3.0
+whitenoise==6.0.0
     # via -r requirements/base.in
-wrapt==1.13.3
+wrapt==1.14.0
     # via deprecated
 wsgiunproxy==1.0
     # via -r requirements/base.in
 xlwt==1.3.0
     # via -r requirements/base.in
-zipp==3.7.0
+zipp==3.8.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

src/requirements/dev.txt

@@ -3,8 +3,8 @@
 -r ./base.txt
 
 # Tools for building
-pip-tools == 6.4.0
-pur == 5.4.2
+pip-tools == 6.6.0
+pur == 6.1.0
 
 # Useful extra developer packages:
 
@@ -23,5 +23,5 @@ yet-another-django-profiler == 1.1.0
 
 # Debugging
 django-debugtools == 2.0
-ipython == 7.31.0
+ipython == 7.32.0
 ptpython == 3.0.20