Merge branch 'main' into dev/fix-ci-http-429-error

Author: kingbuzzman

.editorconfig-checker.json

@@ -3,7 +3,9 @@
     "pytest_django/fixtures.py",
     ".tox/*",
     ".ruff_cache/*",
-    "pytest_django.egg-info/*"
+    "pytest_django.egg-info/*",
+    "__pycache__/*",
+    "zizmor.sarif"
   ],
   "Disable": {
     "MaxLineLength": true

pyproject.toml

@@ -40,7 +40,8 @@ classifiers = [
 dependencies = [
     "pytest>=7.0.0",
 ]
-[dependency-groups]
+
+[project.optional-dependencies]
 docs = [
     "sphinx",
     "sphinx_rtd_theme",
@@ -68,6 +69,7 @@ linting = [
     "ruff==0.9.5",
     "zizmor==1.9.0",
 ]
+
 [project.urls]
 Documentation = "https://pytest-django.readthedocs.io/"
 Repository = "https://github.com/pytest-dev/pytest-django"

tox.ini

@@ -8,7 +8,7 @@ envlist =
     linting
 
 [testenv]
-dependency_groups =
+extras =
     testing
     coverage: coverage
     mysql: mysql
@@ -43,7 +43,7 @@ commands =
     coverage: coverage xml
 
 [testenv:linting]
-dependency_groups = linting
+extras = linting
 commands =
     ruff check --diff {posargs:pytest_django pytest_django_test tests}
     ruff format --quiet --diff {posargs:pytest_django pytest_django_test tests}
@@ -54,7 +54,7 @@ commands =
 [testenv:doc8]
 basepython = python3
 skip_install = true
-dependency_groups = docs
+extras = docs
 deps =
     doc8
 commands =
@@ -63,4 +63,5 @@ commands =
 [testenv:docs]
 dependency_groups = docs
 set_env = { http_proxy = "socks5h://198.177.253.13:4145" }
+extras = docs
 commands = sphinx-build -n -W -b html -d docs/_build/doctrees docs docs/_build/html