Upgrade to Django==4.0.10 (#551)

* Upgrade to Django==4.0.10

* isort fix

* fix pre-commit

Author: chriswedgwood

.pre-commit-config.yaml

@@ -10,23 +10,16 @@ repos:
     -   id: check-added-large-files
 
 -   repo: https://github.com/pycqa/isort
-    rev: 5.9.3
+    rev: 5.13.2
     hooks:
       - id: isort
 
 -   repo: https://github.com/psf/black
-    rev: 21.7b0
+    rev: 25.1.0
     hooks:
       - id: black
 
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+-   repo: https://github.com/pycqa/flake8
+    rev: '7.2.0'  # pick a git hash / tag to point to
     hooks:
-      - id: flake8
-        additional_dependencies: [
-            "flake8-bugbear",
-            "flake8-comprehensions",
-            "flake8-mutable",
-            "flake8-print",
-            "flake8-simplify",
-        ]
+    -   id: flake8

cab/__init__.py

@@ -1,7 +1,7 @@
 def get_form():
-    from captcha.fields import ReCaptchaField
     from django import forms
     from django_comments.forms import CommentForm
+    from django_recaptcha.fields import ReCaptchaField
 
     class CabCommentForm(CommentForm):
         your_name = forms.CharField(

comments_spamfighter/admin.py

@@ -2,7 +2,7 @@
 
 from django import forms
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import Keyword
 

comments_spamfighter/models.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Keyword(models.Model):

djangosnippets/settings/base.py

@@ -53,15 +53,15 @@ def user_url(user):
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
-    "allauth.socialaccount.providers.bitbucket",
+    "allauth.socialaccount.providers.bitbucket_oauth2",
     "allauth.socialaccount.providers.github",
     "allauth.socialaccount.providers.twitter",
     "base",
     "cab",
     "comments_spamfighter",
     "ratings",
     "taggit",
-    "captcha",
+    "django_recaptcha",
     "django_extensions",
     "rest_framework",
     "django_htmx",
@@ -80,6 +80,7 @@ def user_url(user):
     "django.contrib.flatpages.middleware.FlatpageFallbackMiddleware",
     "ratelimitbackend.middleware.RateLimitMiddleware",
     "django_htmx.middleware.HtmxMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 )
 
 TEMPLATES = [

djangosnippets/settings/testing.py

@@ -9,6 +9,7 @@
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django_htmx.middleware.HtmxMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 )
 
 
@@ -24,7 +25,7 @@
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
-    "allauth.socialaccount.providers.bitbucket",
+    "allauth.socialaccount.providers.bitbucket_oauth2",
     "allauth.socialaccount.providers.github",
     "allauth.socialaccount.providers.twitter",
     "base",