Merge branch 'main' into v1.3.0

mkalioby · Sep 27, 2024 · 1cee557 · 1cee557
2 parents 07d7f6d + 310b4f4
commit 1cee557
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/example/test_app/settings.py b/example/test_app/settings.py
@@ -132,4 +132,4 @@
 
 FIDO_SERVER_ID="localhost"      # Server rp id for FIDO2, it the full domain of your project
 FIDO_SERVER_NAME="TestApp"
-KEY_ATTACHMENT = passkeys.Attachment.PLATFORM  # Set None to allow all authenticator attachment
+KEY_ATTACHMENT = None  # Set None to allow all authenticator attachment
diff --git a/example/test_app/tests/test_current_platform.py b/example/test_app/tests/test_current_platform.py
@@ -8,6 +8,8 @@ def setUp(self) -> None:
         if not getattr(self, "assertEquals", None):
             self.assertEquals = self.assertEqual
         self.request_factory = RequestFactory()
+        if not getattr(self, "assertEquals", None):
+            self.assertEquals = self.assertEqual
 
     def check_platform(self,user_agent, platform):
         request = self.request_factory.get('/', HTTP_USER_AGENT=user_agent)

diff --git a/example/test_app/tests/test_fido.py b/example/test_app/tests/test_fido.py
@@ -20,6 +20,8 @@ def get_server_name(request):
 
 class test_fido(TransactionTestCase):
     def setUp(self) -> None:
+        if not getattr(self,"assertEquals",None):
+            self.assertEquals = self.assertEqual
         from django.contrib.auth import get_user_model
         self.user_model = get_user_model()
         if self.user_model.objects.filter(username="test").count()==0:

diff --git a/example/test_app/tests/test_passkeys.py b/example/test_app/tests/test_passkeys.py
@@ -3,6 +3,9 @@
 class test_passkeys(TransactionTestCase):
     def setUp(self) -> None:
         from django.contrib.auth import get_user_model
+        if not getattr(self, "assertEquals", None):
+            self.assertEquals = self.assertEqual
+
         self.user_model = get_user_model()
         self.user = self.user_model.objects.create_user(username="test",password="test")
         self.client = Client()

diff --git a/example/test_app/tests/test_views.py b/example/test_app/tests/test_views.py
@@ -8,6 +8,9 @@ class test_views(TransactionTestCase):
 
     def setUp(self) -> None:
         from django.contrib.auth import get_user_model
+        if not getattr(self, "assertEquals", None):
+            self.assertEquals = self.assertEqual
+
         self.user_model = get_user_model()
         #self.user = self.user_model.objects.create_user(username="test", password="test")
         self.client = Client()

diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
 envlist=
-#    docs,
+    #docs,
     py37-django{20,21,22,32},
     py38-django{22,32,40,41,42},
     py39-django{22,32,40,41,42},
-    py310-django{22,32,40,41,42},
-    py311-django{22,32,40,41,42,50},
-    py312-django{50},
+    py310-django{22,32,40,41,42,50,51},
+    py311-django{22,32,40,41,42,50,51},
+    py312-django{50,51},
 
 
 [testenv]
@@ -18,7 +18,8 @@ deps =
     django40: django>=4.0,<4.1
     django41: django>=4.1,<4.2
     django42: django>=4.2,<4.3
-    django50: django==5.0b1
+    django50: django>=5.0,<5.1
+    django51: django>=5.1,<5.2
     ua-parser
     user-agents
     django-sslserver