From e658968b4e2acaa5e287c5928cdc24f7cc79249f Mon Sep 17 00:00:00 2001
From: Lacey Williams Henschel <laceynwilliams@gmail.com>
Date: Fri, 14 Apr 2023 13:36:28 -0700
Subject: [PATCH] :arrow_up: Upgrade to Django 4.2 and related changes

---
 config/settings.py |  2 --
 config/urls.py     |  2 +-
 requirements.in    |  5 +++--
 requirements.txt   | 12 +++++++-----
 support/forms.py   |  2 +-
 users/__init__.py  |  1 -
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/settings.py b/config/settings.py
index bcdf88b7..87737aa8 100755
--- a/config/settings.py
+++ b/config/settings.py
@@ -187,8 +187,6 @@ TIME_ZONE = "UTC"
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 
diff --git a/config/urls.py b/config/urls.py
index 5caf6f51..fae6fbed 100755
--- a/config/urls.py
+++ b/config/urls.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls import include, re_path
+from django.urls import include, re_path
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic import TemplateView
diff --git a/requirements.in b/requirements.in
index aea15bf5..f4b45998 100755
--- a/requirements.in
+++ b/requirements.in
@@ -1,4 +1,4 @@
-Django>=3.2.18, <4.0
+Django>=4.0, <=4.2
 bumpversion
 django-admin-env-notice==0.4
 django-allauth==0.53.1
@@ -8,7 +8,7 @@ django-health-check
 django-redis
 django-rest-auth
 django-widget-tweaks
-djangorestframework
+djangorestframework>=3.14
 environs[django]
 gevent
 gunicorn
@@ -53,6 +53,7 @@ python-frontmatter
 
 #Forum
 django-machina>=1.2
+django-haystack>=3.2
 
 # Github
 ghapi
diff --git a/requirements.txt b/requirements.txt
index 797b8f5c..e8e24afa 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -77,7 +77,7 @@ dj-database-url==0.5.0
     # via environs
 dj-email-url==1.0.2
     # via environs
-django==3.2.18
+django==4.2
     # via
     #   -r ./requirements.in
     #   django-allauth
@@ -105,8 +105,10 @@ django-db-geventpool==4.0.0
     # via -r ./requirements.in
 django-extensions==3.1.3
     # via -r ./requirements.in
-django-haystack==3.1.1
-    # via django-machina
+django-haystack==3.2.1
+    # via
+    #   -r ./requirements.in
+    #   django-machina
 django-health-check==3.16.4
     # via -r ./requirements.in
 django-js-asset==1.2.2
@@ -129,7 +131,7 @@ django-widget-tweaks==1.4.9
     # via
     #   -r ./requirements.in
     #   django-machina
-djangorestframework==3.12.4
+djangorestframework==3.14.0
     # via
     #   -r ./requirements.in
     #   django-rest-auth
@@ -261,7 +263,7 @@ python3-openid==3.2.0
 pytz==2021.1
     # via
     #   celery
-    #   django
+    #   djangorestframework
     #   fs
 pyyaml==6.0
     # via python-frontmatter
diff --git a/support/forms.py b/support/forms.py
index 6d5f58dc..e25e4872 100644
--- a/support/forms.py
+++ b/support/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class ContactForm(forms.Form):
diff --git a/users/__init__.py b/users/__init__.py
index 594a3d12..e69de29b 100644
--- a/users/__init__.py
+++ b/users/__init__.py
@@ -1 +0,0 @@
-default_app_config = "users.apps.UsersConfig"