chore: merge main and resolve requirements.txt conflicts

Co-authored-by: dtoxvanilla1991 <73205087+dtoxvanilla1991@users.noreply.github.com>

Author: Copilot

.gitignore

@@ -40,12 +40,10 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
-nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
-venv/
-.venv/
+.venv*/
 .python-version
 .pytest_cache
 
@@ -59,9 +57,6 @@ venv/
 # Sphinx documentation
 docs/_build/
 
-# PyBuilder
-target/
-
 # Ipython Notebook
 .ipynb_checkpoints
 

pyproject.toml

@@ -24,7 +24,8 @@ dependencies = [
     "python-dateutil >=2.9.0, <3.0",
     "Authlib >=1.3.0, <2.0",
     "pyjwt >=2.10.0, <3.0",
-    "requests >=2.32.2, <3.0",
+    "requests ~=2.32.5; python_version < '3.10'",
+    "requests ~=2.33.0; python_version >= '3.10'",
     "typing-extensions >=4.11.0, <5.0",
     "frozendict >=2.4.3, <3.0",
     "certifi >=2026.1.4",
@@ -47,7 +48,9 @@ flask = [
     "flask >=3.0.0, <4.0.0",
 ]
 dev = [
-    "pytest >=7.4.0",
+    # pytest 9 requires Python >=3.10; pytest 9.0.3 fixes CVE-2025-71176
+    "pytest >=9.0.3; python_version >= '3.10'",
+    "pytest >=7.4.0,<9; python_version < '3.10'",
     "pytest-cov >=4.1.0",
     "pytest-django >=4.5.2",
     "mypy >=1.5.0",
@@ -81,7 +84,11 @@ zip-safe = false
 "kinde_flask" = ["**/*.py", "**/*.json", "**/*.yaml", "**/*.yml"]
 
 [tool.poetry.dev-dependencies]
-pytest = "^7.4.0"
+# pytest 9 requires Python >=3.10; pytest 9.0.3 fixes CVE-2025-71176
+pytest = [
+    {version = ">=7.4.0,<9", python = "~3.9"},
+    {version = "^9.0.3", python = ">=3.10"}
+]
 pytest-cov = "^7.0.0"
 coverage = ">=7.10.6"
 pytest-django = "^4.5.2"
@@ -94,4 +101,3 @@ pytest-timeout = "^2.2.0"
 black = "^26.0.0"
 flake8 = "^7.0.0"
 isort = "^8.0.0"
-

requirements.txt

@@ -1,8 +1,9 @@
-requests~=2.33.0
+requests~=2.32.5; python_version < "3.10"
+requests~=2.33.0; python_version >= "3.10"
 # Core dependencies
 django>=4.2.0,<5.0.0
 python-dotenv>=1.0.0
-cryptography>=46.0.6
+cryptography>=46.0.6,<47.0
 pyjwt>=2.10.0
 fastapi>=0.110.0
 flask>=3.0.0
@@ -20,7 +21,10 @@ certifi>=2026.1.4
 pydantic>=2.0.0,<3.0.0
 
 # Development dependencies
-pytest>=7.4.0
+# pytest 9 requires Python >=3.10; keep <9 for Python 3.9 (pytest 9 dropped 3.9 support)
+# CVE-2025-71176 is fixed in 9.0.3 (only available for Python >=3.10)
+pytest>=9.0.3; python_version >= "3.10"
+pytest>=7.4.0,<9; python_version < "3.10"
 pytest-django>=4.5.2
 pytest-asyncio>=0.21.1
 pytest-cov>=7.0.0