Adding Django 5.0b1 to test matrix

mkalioby · Oct 28, 2023 · fa5bb5b · fa5bb5b
1 parent 5266697
commit fa5bb5b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/.github/workflows/run_tox.yml b/.github/workflows/run_tox.yml
@@ -23,6 +23,7 @@ jobs:
             3.9
             3.10
             3.11
+            3.12
     - name: Install tox
       run: |
         python -m pip install --upgrade pip

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,16 @@
+## v1.2.6
+
+* Adding Django 5.0 to test matrix and pypi classifiers
+
 ## 1.2.5
 
 * Fix: Aborting the conditional UI was not working when 'Login by Passkeys' is clicked.
 
+
+## v1.2.4
+
+* No Change just updating README.md
+
 ## v1.2.3
 
 * No Change just updating README.md

diff --git a/example/test_app/test_settings.py b/example/test_app/test_settings.py
@@ -133,3 +133,7 @@
 FIDO_SERVER_ID="testserver"      # Server rp id for FIDO2, it the full domain of your project
 FIDO_SERVER_NAME="TestApp"
 KEY_ATTACHMENT = passkeys.Attachment.PLATFORM
+<<<<<<< Updated upstream
+=======
+CSRF_TRUSTED_ORIGINS = ['http://localhost:8000','https://localhost:8000']
+>>>>>>> Stashed changes
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='django-passkeys',
-    version='1.2.5',
+    version='1.2.6',
     description='A Django Authentication Backend for Passkeys',
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
@@ -37,6 +37,7 @@
         "Framework :: Django :: 4.0",
         "Framework :: Django :: 4.1",
         "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "Programming Language :: Python",

diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,8 @@ envlist=
     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},
+    py311-django{22,32,40,41,42,50},
+
 
 [testenv]
 changedir=
@@ -16,6 +17,7 @@ deps =
     django40: django>=4.0,<4.1
     django41: django>=4.1,<4.2
     django42: django>=4.2,<4.3
+    django50: django==5.0b1
     ua-parser
     user-agents
     django-sslserver