Bump Django version to 4.2 (#707)

Co-authored-by: Jake Rosenberg <[email protected]>
Co-authored-by: Wesley B <[email protected]>
Co-authored-by: Jake Rosenberg <[email protected]>
Co-authored-by: Wesley Bomar <[email protected]>

docker-compose.dev.yml

@@ -14,7 +14,7 @@ services:
       - core_cms_net
 
   postgres:
-    image: postgres:11.5
+    image: postgres:14.9
     environment:
       - POSTGRES_PASSWORD=taccforever
       - POSTGRES_USER=postgresadmin

docker-compose.example-cms.yml

@@ -14,7 +14,7 @@ services:
       - core_cms_net
 
   postgres:
-    image: postgres:11.5
+    image: postgres:14.9
     environment:
       - POSTGRES_PASSWORD=taccforever
       - POSTGRES_USER=postgresadmin

pyproject.toml

@@ -6,7 +6,7 @@ authors = ["TACC-WMA <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-aldryn-apphooks-config = "0.6.0"
+aldryn-apphooks-config = "0.7.0"
 aldryn-boilerplates = "0.8.0"
 aldryn-common = "1.0.5"
 aldryn-search = "1.1.0"
@@ -16,49 +16,50 @@ autopep8 = "1.5.4"
 certifi = "2020.6.20"
 chardet = "3.0.4"
 colorclass = "2.2.0"
-Django = "^3.2"
+Django = "^4.2"
 django-appconf = "1.0.4"
-django-appdata = "0.3.2"
+django-appdata = "0.4.0"
 django-auth-ldap = "2.2.0"
 django-classy-tags = "2.0.0"
 django-cms = "^3.8.0"
 django-filer = "^2.2"
 django-formtools = "2.2"
-django-haystack = "3.0"
+django-haystack = "3.2.1"
 django-ipware = "3.0.1"
 django-js-asset = "1.2.2"
 django-meta = "^2.1"
 django-mptt = "0.14.0"
-django-parler = "2.2"
+django-parler = "2.3"
 django-polymorphic = "3.0.0"
 django-sekizai = "2.0.0"
 django-settings-export = "1.2.1"
 django-sortedm2m = "3.0.2"
 django-spurl = "0.6.7"
 django-standard-form = "1.1.1"
-django-taggit = "1.2.0"
-django-taggit-autosuggest = "0.3.8"
+django-taggit = "4.0.0"
+django-taggit-autosuggest = "0.4.1"
 django-taggit-templatetags = "0.2.5"
 django-templatetag-sugar = "1.0"
 django-treebeard = "^4.4"
-djangocms-admin-style = "2.0.0"
+djangocms-admin-style = "~3.2.6"
 djangocms-apphook-setup = "0.4.1"
 djangocms-attributes-field = "2.1.0"
 djangocms-blog = "^1.2"
-djangocms-bootstrap4 = "3.0.0"
+# djangocms-bootstrap4 commit to remove deprecated imports: https://github.com/django-cms/djangocms-bootstrap4/pull/162
+djangocms-bootstrap4 = { git = "https://github.com/django-cms/djangocms-bootstrap4", rev = "2fc7f14c2b7b53882faf6830289b5052f775965f" }
 djangocms-column = "^2.0"
 djangocms-file = "3.0.0"
-djangocms-forms-maintained = { git = "https://github.com/avryhof/djangocms-forms", rev = "d8a69efd2f447ee2f940c7b6f5b8b088c9cb79ed" }
+djangocms-forms-maintained = { git = "https://github.com/TACC/djangocms-forms", rev = "fd7c7a33309c5b7cc380f392ec3344851c606bc2" }
 djangocms-googlemap = "2.0.0"
 djangocms-icon = "2.0.0"
 djangocms-link = "^3.1"
-djangocms-page-meta = "^1.1.0"
+djangocms-page-meta = "1.3.0"
 djangocms-picture = "3.0.0"
 djangocms-snippet = "3.0.0"
 djangocms-style = "3.0.0"
-djangocms-tacc-image-gallery = { git = "https://github.com/TACC/Core-CMS-Plugin-Image-Gallery.git", rev = "v0.1.3" }
+djangocms-tacc-image-gallery = { git = "https://github.com/TACC/Core-CMS-Plugin-Image-Gallery.git", rev = "v0.1.4" }
 djangocms-text-ckeditor = "^5.1"
-djangocms-transfer = "1.0.0"
+djangocms-transfer = "1.0.1"
 djangocms-video = "3.0.0"
 django-test-without-migrations = "0.6"
 docopt = "0.6.2"

taccsite_cms/contrib/taccsite_sample/cms_plugins.py

@@ -2,7 +2,7 @@
 from cms.plugin_pool import plugin_pool
 
 from django.utils.translation import gettext_lazy as _
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str as force_text
 
 from .models import TaccsiteSample
 

taccsite_cms/django/contrib/staticfiles_custom/__init__.py

@@ -1,3 +0,0 @@
-# FAQ: Avoid `TemplateSyntaxError` "'staticfiles' is not a registered tag library."
-# SEE: https://docs.djangoproject.com/en/2.2/ref/applications/#for-application-authors
-default_app_config = 'taccsite_cms.django.contrib.staticfiles_custom.apps.TaccStaticFilesConfig'

taccsite_cms/django/contrib/staticfiles_custom/apps.py

@@ -1,3 +1,6 @@
+# FAQ: Avoid `TemplateSyntaxError` "'staticfiles' is not a registered tag library."
+# SEE: https://docs.djangoproject.com/en/2.2/ref/applications/#for-application-authors
+
 from django.contrib.staticfiles.apps import StaticFilesConfig
 
 # Make `python manage.py collectstatic` ignore `src/` files

taccsite_cms/search_indexes.py

@@ -9,7 +9,7 @@
 from django.test import RequestFactory
 
 from django.utils.html import strip_tags
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str as force_text
 
 from cms.models import Title, CMSPlugin, Page
 # from cms.toolbar.toolbar import CMSToolbar

taccsite_cms/settings.py

@@ -390,7 +390,7 @@ def gettext(s): return s
     # customize 'django.contrib.staticfiles'
     # SEE: https://stackoverflow.com/q/57921970/11817077
     # 'django.contrib.staticfiles',
-    'taccsite_cms.django.contrib.staticfiles_custom',
+    'taccsite_cms.django.contrib.staticfiles_custom.apps.TaccStaticFilesConfig',
     'django.contrib.messages',
 
     # key django CMS modules

taccsite_cms/urls.py

@@ -4,7 +4,8 @@
 from cms.sitemaps import CMSSitemap
 from django.conf import settings
 from django.conf.urls.static import static
-from django.conf.urls import include, url
+from django.conf.urls import include
+from django.urls import re_path as url
 from django.contrib import admin
 from django.contrib.auth import views
 from django.contrib.sitemaps.views import sitemap