Merge branch 'main' into dev/remove-codecov

Author: kingbuzzman

.editorconfig

@@ -0,0 +1,37 @@
+# https://editorconfig.org/
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+[*.py]
+max_line_length = 99
+
+[*.yml]
+indent_size = 2
+
+[*.ini]
+indent_size = 2
+
+[*.json]
+indent_size = 2
+insert_final_newline = unset
+
+[*.rst]
+indent_size = unset
+insert_final_newline = unset
+
+[*.bat]
+indent_style = tab
+
+[LICENSE]
+indent_size = unset
+
+[docs/Makefile]
+indent_style = tab

.editorconfig-checker.json

@@ -0,0 +1,13 @@
+{
+  "Exclude": [
+    "pytest_django/fixtures.py",
+    ".tox/*",
+    ".ruff_cache/*",
+    "pytest_django.egg-info/*",
+    "__pycache__/*",
+    "zizmor.sarif"
+  ],
+  "Disable": {
+    "MaxLineLength": true
+  }
+}

.github/workflows/deploy.yml

@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
 
       - name: Build and Check Package
-        uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310  # v2.12.0
+        uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076  # v2.13.0
 
   deploy:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest-django'

.github/workflows/main.yml

@@ -52,8 +52,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install tox==4.26.0
+          python -m pip install uv
+          uv tool install tox==4.28.4 --with tox-uv
 
       - name: Run tox
         run: tox
@@ -243,6 +243,6 @@ jobs:
 
     steps:
     - name: Decide whether the needed jobs succeeded or failed
-      uses: re-actors/alls-green@223e4bb7a751b91f43eda76992bcfbf23b8b0302
+      uses: re-actors/alls-green@2765efec08f0fd63e83ad900f5fd75646be69ff6
       with:
         jobs: ${{ toJSON(needs) }}

.readthedocs.yml

@@ -9,11 +9,11 @@ build:
     python: "3"
 
 python:
-   install:
-      - method: pip
-        path: .
-        extra_requirements:
-          - docs
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
 
 formats:
   - epub

docs/faq.rst

@@ -79,7 +79,7 @@ How can I use ``manage.py test`` with pytest-django?
 ----------------------------------------------------
 
 pytest-django is designed to work with the ``pytest`` command, but if you
-really need integration with ``manage.py test``, you can add this class path 
+really need integration with ``manage.py test``, you can add this class path
 in your Django settings:
 
 .. code-block:: python

docs/managing_python_path.rst

@@ -87,7 +87,7 @@ You can explicitly add paths to the Python search path using pytest's
 Example: project with src layout
 ````````````````````````````````
 
-For a Django package using the ``src`` layout, with test settings located in a 
+For a Django package using the ``src`` layout, with test settings located in a
 ``tests`` package at the top level::
 
     myproj

docs/usage.rst

@@ -33,7 +33,7 @@ You can switch it on in `pytest.ini`::
 
     [pytest]
     FAIL_INVALID_TEMPLATE_VARS = True
-    
+
 Additional pytest.ini settings
 ------------------------------
 

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
-  "setuptools>=61.0.0",
-  "setuptools-scm[toml]>=5.0.0",
+    "setuptools>=61.0.0",
+    "setuptools-scm[toml]>=5.0.0",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -40,7 +40,8 @@ classifiers = [
 dependencies = [
     "pytest>=7.0.0",
 ]
-[dependency-groups]
+
+[project.optional-dependencies]
 docs = [
     "sphinx",
     "sphinx_rtd_theme",
@@ -63,10 +64,12 @@ xdist = [
     "pytest-xdist",
 ]
 linting = [
+    "editorconfig-checker==3.2.1",
     "mypy==1.15.0",
     "ruff==0.9.5",
     "zizmor==1.9.0",
 ]
+
 [project.urls]
 Documentation = "https://pytest-django.readthedocs.io/"
 Repository = "https://github.com/pytest-dev/pytest-django"

tests/test_django_configurations.py

@@ -58,9 +58,9 @@ def test_dc_env_overrides_ini(pytester: pytest.Pytester, monkeypatch: pytest.Mon
 
     pytester.makeini(
         """
-       [pytest]
-       DJANGO_SETTINGS_MODULE = DO_NOT_USE_ini
-       DJANGO_CONFIGURATION = DO_NOT_USE_ini
+        [pytest]
+        DJANGO_SETTINGS_MODULE = DO_NOT_USE_ini
+        DJANGO_CONFIGURATION = DO_NOT_USE_ini
     """
     )
     pkg = pytester.mkpydir("tpkg")
@@ -91,9 +91,9 @@ def test_dc_ini(pytester: pytest.Pytester, monkeypatch: pytest.MonkeyPatch) -> N
 
     pytester.makeini(
         """
-       [pytest]
-       DJANGO_SETTINGS_MODULE = tpkg.settings_ini
-       DJANGO_CONFIGURATION = MySettings
+        [pytest]
+        DJANGO_SETTINGS_MODULE = tpkg.settings_ini
+        DJANGO_CONFIGURATION = MySettings
     """
     )
     pkg = pytester.mkpydir("tpkg")
@@ -125,9 +125,9 @@ def test_dc_option(pytester: pytest.Pytester, monkeypatch: pytest.MonkeyPatch) -
 
     pytester.makeini(
         """
-       [pytest]
-       DJANGO_SETTINGS_MODULE = DO_NOT_USE_ini
-       DJANGO_CONFIGURATION = DO_NOT_USE_ini
+        [pytest]
+        DJANGO_SETTINGS_MODULE = DO_NOT_USE_ini
+        DJANGO_CONFIGURATION = DO_NOT_USE_ini
     """
     )
     pkg = pytester.mkpydir("tpkg")