Bump django-recaptcha from 3.0.0 to 4.0.0

create-envfile.py

@@ -124,7 +124,7 @@ def _get_vals_to_replace(args):
  prog="ENV file builder",
  description="Tool for generate environment file automatically. The information can be passed or via CLI or via JSON file ( --file /path/env.json)",
  usage="python create-envfile.py localhost -f /path/to/json/file.json",
- allow_abbrev=False
+ allow_abbrev=False,
  )
  parser.add_argument(
  "--noinput",

geonode/people/forms.py

@@ -24,7 +24,10 @@
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.utils.translation import ugettext as _
 
-from captcha.fields import ReCaptchaField
+try:
+ from captcha.fields import ReCaptchaField
+except ImportError:
+ from django_recaptcha.fields import ReCaptchaField
 
 # Ported in from django-registration
 attrs_dict = {"class": "required"}

geonode/settings.py

@@ -1404,8 +1404,8 @@
 RECAPTCHA_ENABLED = ast.literal_eval(os.environ.get("RECAPTCHA_ENABLED", "False"))
 
 if RECAPTCHA_ENABLED:
- if "captcha" not in INSTALLED_APPS:
- INSTALLED_APPS += ("captcha",)
+ if "django_recaptcha" not in INSTALLED_APPS:
+ INSTALLED_APPS += ("django_recaptcha",)
  ACCOUNT_SIGNUP_FORM_CLASS = os.getenv(
  "ACCOUNT_SIGNUP_FORM_CLASS", "geonode.people.forms.AllauthReCaptchaSignupForm"
  )

requirements.txt

@@ -71,7 +71,7 @@ django-floppyforms<1.10.0
 django-forms-bootstrap<=3.1.0
 django-autocomplete-light==3.5.1
 django-invitations<2.1.1
-django-recaptcha==3.0.0
+django-recaptcha==4.0.0
 
 # REST
 djangorestframework==3.12.0