Skip to content

Commit fff160f

Browse files
[deps] Update django-allauth[socialaccount] requirement from ~=65.8.1 to ~=65.12.0
* [deps] Update django-allauth[socialaccount] requirement --- updated-dependencies: - dependency-name: django-allauth[socialaccount] dependency-version: 65.11.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * [deps] Turned off allauth rate limiting in testing * [chores] Avoid ambiguity of contrib.admin --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Federico Capoano <[email protected]>
1 parent 9dd12e5 commit fff160f

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

openwisp_users/tests/test_admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from unittest.mock import patch
66

77
import django
8-
from django.contrib import admin
8+
from django.contrib import admin as django_admin
99
from django.contrib.auth import REDIRECT_FIELD_NAME, get_user_model
1010
from django.contrib.auth.models import Permission
1111
from django.core import mail
@@ -1967,7 +1967,7 @@ def test_class_attr_regression(self):
19671967
class TestAdmin(MultitenantAdminMixin):
19681968
multitenant_parent = "test"
19691969

1970-
owner_admin = OrganizationOwnerAdmin(Organization, admin.site)
1970+
owner_admin = OrganizationOwnerAdmin(Organization, django_admin.site)
19711971

19721972
test_admin = TestAdmin()
19731973
with self.subTest("multitenant_parent added to multitenant_shared_relations"):

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
django-organizations~=2.5.0
22
django-extensions>=3.2,<4.2
3-
django-allauth[socialaccount]~=65.8.1
3+
django-allauth[socialaccount]>=65.12.0,<65.13.0
44
django-phonenumber-field~=8.1.0
55
phonenumbers~=9.0.15
66
openwisp-utils[rest,celery] @ https://github.com/openwisp/openwisp-utils/tarball/1.2

tests/openwisp2/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@
162162
LOGIN_REDIRECT_URL = "admin:index"
163163
ACCOUNT_EMAIL_CONFIRMATION_ANONYMOUS_REDIRECT_URL = "email_confirmation_success"
164164
ACCOUNT_EMAIL_CONFIRMATION_AUTHENTICATED_REDIRECT_URL = "email_confirmation_success"
165+
# disable allauth ratelimiting during automated tests
166+
if TESTING:
167+
ACCOUNT_RATE_LIMITS = False
165168

166169
if not PARALLEL:
167170
CACHES = {

0 commit comments

Comments
 (0)