Skip to content

Commit aa37f49

Browse files
committed
deps: bump versions and update django-allauth config
1 parent 3187d71 commit aa37f49

2 files changed

Lines changed: 32 additions & 28 deletions

File tree

django/core/settings/defaults.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -521,15 +521,19 @@ def set_environment(env: Environment):
521521
}
522522

523523
# SSO, user registration, and django-allauth configuration, see
524-
# https://django-allauth.readthedocs.io/en/latest/configuration.html
524+
# https://django-allauth.readthedocs.io/en/latest/installation/quickstart.html
525+
# and
526+
# https://django-allauth.readthedocs.io/en/latest/account/configuration.html
525527
# ACCOUNT_ADAPTER = 'core.adapter.AccountAdapter'
526-
ACCOUNT_AUTHENTICATION_METHOD = "username_email"
528+
# ACCOUNT_AUTHENTICATION_METHOD = "username_email"
529+
ACCOUNT_LOGIN_METHODS = {"email", "username"}
527530
ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = 15
528-
ACCOUNT_EMAIL_REQUIRED = True
531+
# FIXME: deprecated
532+
# ACCOUNT_EMAIL_REQUIRED = True
533+
# ACCOUNT_SIGNUP_EMAIL_ENTER_TWICE = True
534+
ACCOUNT_SIGNUP_FIELDS = ['email*', 'email2*', 'username*', 'password1*', 'password2*']
529535
ACCOUNT_EMAIL_VERIFICATION = "mandatory"
530536
ACCOUNT_SIGNUP_FORM_CLASS = "core.forms.SignupForm"
531-
# FIXME: enable after configuring form
532-
ACCOUNT_SIGNUP_EMAIL_ENTER_TWICE = True
533537
ACCOUNT_TEMPLATE_EXTENSION = "jinja"
534538
ACCOUNT_PRESERVE_USERNAME_CASING = False
535539
ACCOUNT_LOGIN_ON_PASSWORD_RESET = True

django/requirements.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
bagit==1.8.1
2-
bleach==6.2.0
3-
datacite==1.2.0
1+
bagit==1.9.0
2+
bleach==6.3.0
3+
datacite==1.3.1
44
dedupe==3.0.3
5-
django-allauth==65.3.0
6-
django-anymail[mailgun]==12.0
5+
django-allauth==65.13.1
6+
django-anymail[mailgun]==13.1
77
django-cookie-law==2.2.0
8-
django-csp[jinja2]==3.8
9-
django-extensions==3.2.3
10-
django-guardian==2.4.0
8+
django-csp[jinja2]==4.0
9+
django-extensions==4.1
10+
django-guardian==3.2.0
1111
django-hcaptcha-field==1.4.0
1212
django-ipware==7.0.1
1313
django-location-field==2.7.3
1414
django-markupfield==2.0.1
1515
django-modelcluster>=6.2.0
1616
django-model-utils==5.0.0
17-
django-redis==5.4.0
17+
django-redis==6.0.0
1818
django-rest-auth==0.9.5
1919
django-rest-swagger==2.2.0
20-
django-reversion==5.1.0
20+
django-reversion==6.0.0
2121
django-robots==6.1
2222
django-timezone-field==7.0.0
23-
django-vite==3.0.5
24-
django-waffle==4.2.0
25-
djangorestframework==3.15.2
23+
django-vite==3.1.0
24+
django-waffle==5.0.0
25+
djangorestframework==3.16.1
2626
djangorestframework-camel-case==1.4.2
2727
Django==5.2.9
2828
elasticsearch-dsl>=7.0.0,<8.0.0
2929
elasticsearch>=7.0.0,<8.0.0
3030
html2text>=2016.9.19
3131
huey==2.5.3
3232
jinja2==3.1.6
33-
jsonschema==4.23.0
33+
jsonschema==4.25.1
3434
markdown==3.8.2
3535
nltk>=3.8.1,<4.0.0
3636
numpy==1.26.4
3737
pandas==2.2.2
38-
psycopg2-binary==2.9.10
38+
psycopg2-binary==2.9.11
3939
pyjwt[crypto]>=2.4.0,<3.0.0
40-
pytz==2024.1
40+
pytz==2025.2
4141
pyyaml>=6.0.1
4242
# used for institution -> affiliation data migration
4343
rapidfuzz==3.9.3
4444
rarfile==4.2
45-
redis==4.5.5
46-
requests==2.32.4
47-
semver==3.0.2
48-
sentry-cli==2.32.1
49-
sentry-sdk==2.19.2
45+
redis==7.1.0
46+
requests==2.32.5
47+
semver==3.0.4
48+
sentry-cli==2.58.2
49+
sentry-sdk==2.47.0
5050
shortuuid==1.0.13
5151
tzdata==2024.1
52-
uwsgi==2.0.28
52+
uwsgi==2.0.31
5353
uwsgitop==0.12
54-
wagtail==7.1.1
54+
wagtail==7.2.1
5555
wagtail-modeladmin==2.2.0
5656
invoke
5757
ipython

0 commit comments

Comments
 (0)