Merge pull request #1497 from wger-project/dependabot/pip/django-reca…

…ptcha-approx-eq-4.0.0

Update django-recaptcha requirement from ~=3.0.0 to ~=4.0.0

requirements.txt

@@ -10,7 +10,7 @@ crispy-bootstrap5==0.7
 # we might need to think about migrating away from this completely
 django-bootstrap-breadcrumbs2==1.0.0
 django-formtools~=2.4
-django-recaptcha~=3.0.0
+django-recaptcha~=4.0.0
 Django==4.2.6
 django-activity-stream==2.0.0
 django-axes==6.1.1

wger/core/forms.py

@@ -36,8 +36,6 @@
 from django.utils.translation import gettext as _
 
 # Third Party
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV3
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
     HTML,
@@ -48,6 +46,8 @@
     Row,
     Submit,
 )
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV3
 
 # wger
 from wger.core.models import UserProfile
@@ -196,7 +196,7 @@ def clean_email(self):
         if not email:
             return email
         try:
-            #Performs a case-insensitive lookup
+            # Performs a case-insensitive lookup
             user = User.objects.get(email__iexact=email)
             if user.email == self.instance.email:
                 return email

wger/core/models/profile.py

@@ -523,8 +523,8 @@ def user_bodyweight(self, weight):
         """
         if (
             not WeightEntry.objects.filter(user=self.user).exists() or (
-                datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date
-                > datetime.timedelta(days=3)
+                datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date >
+                datetime.timedelta(days=3)
             )
         ):
             entry = WeightEntry()

wger/settings_global.py

@@ -69,7 +69,7 @@
     'wger.measurements',
 
     # reCaptcha support, see https://github.com/praekelt/django-recaptcha
-    'captcha',
+    'django_recaptcha',
 
     # The sitemaps app
     'django.contrib.sitemaps',