Update ruff dependencies and improve code quality (#1295)

- Bump versions of linting tools in pyproject.toml for better compatibility and features.
- Add missing copyright notice to ignore list.
- Refactor variable names in fixtures for clarity.
- Add noqa comments to suppress linting warnings in specific functions.
- Update test assertions for better readability and consistency.

These changes enhance the maintainability and functionality of the codebase.

Author: kingbuzzman

pyproject.toml

@@ -65,7 +65,7 @@ xdist = [
 linting = [
     "editorconfig-checker==3.2.1",
     "mypy==1.17.1",
-    "ruff==0.12.8",
+    "ruff==0.16.1",
     "zizmor==1.11.0",
 ]
 [project.urls]
@@ -219,6 +219,7 @@ ignore = [
     "S101",   # Use of `assert` detected
 
     # TODO - need to fix these
+    "CPY001",  # Missing copyright notice at top of file
     "C901",    # .. is too complex
     "COM812",  # Trailing comma missing
     "E501",    # Line too long

pytest_django/asserts.py

@@ -1,6 +1,7 @@
 """
 Dynamically load all Django assertion cases and expose them for importing.
 """
+# ruff: noqa: PLR0917
 
 from __future__ import annotations
 

pytest_django/fixtures.py

@@ -124,11 +124,11 @@ def _get_databases_for_test(test: pytest.Item) -> tuple[Iterable[str], bool]:
         marker_db = test.get_closest_marker("django_db")
         if marker_db:
             (
-                transaction,
-                reset_sequences,
+                _transaction,
+                _reset_sequences,
                 databases,
                 serialized_rollback,
-                available_apps,
+                _available_apps,
             ) = validate_django_db(marker_db)
         elif "db" in fixtures or "transactional_db" in fixtures or "live_server" in fixtures:
             serialized_rollback = "django_db_serialized_rollback" in fixtures
@@ -160,7 +160,7 @@ def _get_databases_for_setup(
 
 
 @pytest.fixture(scope="session")
-def django_db_setup(
+def django_db_setup(  # noqa: PLR0917
     request: pytest.FixtureRequest,
     django_test_environment: None,  # noqa: ARG001
     django_db_blocker: DjangoDbBlocker,

pytest_django/plugin.py

@@ -251,7 +251,7 @@ def _setup_django(config: pytest.Config) -> None:
 
 
 def _get_boolean_value(
-    x: None | (bool | str),
+    x: bool | str | None,
     name: str,
     default: bool | None = None,
 ) -> bool:
@@ -470,9 +470,9 @@ def get_order_number(test: pytest.Item) -> int:
                 (
                     transaction,
                     reset_sequences,
-                    databases,
-                    serialized_rollback,
-                    available_apps,
+                    _databases,
+                    _serialized_rollback,
+                    _available_apps,
                 ) = validate_django_db(marker_db)
                 uses_db = True
                 transactional = transaction or reset_sequences

tests/test_database.py

@@ -435,8 +435,10 @@ def test_db_access_3(self):
             "*test_db_access_2 FAILED*",
             "*test_db_access_3 FAILED*",
             "*ERROR at setup of TestCase_setupClass.test_db_access_1*",
-            '*RuntimeError: Database access not allowed, use the "django_db" mark, '
-            'or the "db" or "transactional_db" fixtures to enable it.',
+            (
+                '*RuntimeError: Database access not allowed, use the "django_db" mark, '
+                'or the "db" or "transactional_db" fixtures to enable it.'
+            ),
         ]
     )
 
@@ -517,8 +519,10 @@ def test_db_access_in_conftest(self, django_pytester: DjangoPytester) -> None:
         result = django_pytester.runpytest_subprocess("-v")
         result.stderr.fnmatch_lines(
             [
-                '*RuntimeError: Database access not allowed, use the "django_db" mark, '
-                'or the "db" or "transactional_db" fixtures to enable it.*'
+                (
+                    '*RuntimeError: Database access not allowed, use the "django_db" mark, '
+                    'or the "db" or "transactional_db" fixtures to enable it.*'
+                )
             ]
         )
 
@@ -533,7 +537,9 @@ def test_db_access_in_test_module(self, django_pytester: DjangoPytester) -> None
         result = django_pytester.runpytest_subprocess("-v")
         result.stdout.fnmatch_lines(
             [
-                '*RuntimeError: Database access not allowed, use the "django_db" mark, '
-                'or the "db" or "transactional_db" fixtures to enable it.'
+                (
+                    '*RuntimeError: Database access not allowed, use the "django_db" mark, '
+                    'or the "db" or "transactional_db" fixtures to enable it.'
+                )
             ]
         )

tests/test_django_configurations.py

@@ -44,8 +44,10 @@ def test_settings():
     result = pytester.runpytest_subprocess()
     result.stdout.fnmatch_lines(
         [
-            "django: version: *, settings: tpkg.settings_env (from env), "
-            "configuration: MySettings (from env)",
+            (
+                "django: version: *, settings: tpkg.settings_env (from env), "
+                "configuration: MySettings (from env)"
+            ),
             "* 1 passed*",
         ]
     )
@@ -78,8 +80,10 @@ def test_ds():
     result = pytester.runpytest_subprocess()
     result.stdout.fnmatch_lines(
         [
-            "django: version: *, settings: tpkg.settings_env (from env), "
-            "configuration: MySettings (from env)",
+            (
+                "django: version: *, settings: tpkg.settings_env (from env), "
+                "configuration: MySettings (from env)"
+            ),
             "* 1 passed*",
         ]
     )
@@ -111,8 +115,10 @@ def test_ds():
     result = pytester.runpytest_subprocess()
     result.stdout.fnmatch_lines(
         [
-            "django: version: *, settings: tpkg.settings_ini (from ini), "
-            "configuration: MySettings (from ini)",
+            (
+                "django: version: *, settings: tpkg.settings_ini (from ini), "
+                "configuration: MySettings (from ini)"
+            ),
             "* 1 passed*",
         ]
     )
@@ -145,8 +151,10 @@ def test_ds():
     result = pytester.runpytest_subprocess("--ds=tpkg.settings_opt", "--dc=MySettings")
     result.stdout.fnmatch_lines(
         [
-            "django: version: *, settings: tpkg.settings_opt (from option),"
-            " configuration: MySettings (from option)",
+            (
+                "django: version: *, settings: tpkg.settings_opt (from option),"
+                " configuration: MySettings (from option)"
+            ),
             "* 1 passed*",
         ]
     )

tests/test_environment.py

@@ -294,7 +294,7 @@ def test_database_rollback_again() -> None:
 
 @pytest.mark.django_db
 def test_database_name() -> None:
-    dirname, name = os.path.split(connection.settings_dict["NAME"])
+    _dirname, name = os.path.split(connection.settings_dict["NAME"])
     assert "file:memorydb" in name or name == ":memory:" or name.startswith("test_")
 
 

tests/test_fixtures.py

@@ -139,8 +139,10 @@ def test_django_assert_max_num_queries_db(
                 Item.objects.create(name="3-quux")
 
         assert excinfo.value.args == (
-            "Expected to perform 2 queries or less but 3 were done "
-            "(add -v option to show queries)",
+            (
+                "Expected to perform 2 queries or less but 3 were done "
+                "(add -v option to show queries)"
+            ),
         )
         assert len(captured.captured_queries) == 3
         assert "1-foo" in captured.captured_queries[0]["sql"]
@@ -766,15 +768,15 @@ class Test_django_db_blocker:
     def test_block_manually(self, django_db_blocker: DjangoDbBlocker) -> None:
         try:
             django_db_blocker.block()
-            with pytest.raises(RuntimeError, match="^Database access not allowed,"):
+            with pytest.raises(RuntimeError, match=r"^Database access not allowed,"):
                 Item.objects.exists()
         finally:
             django_db_blocker.restore()
 
     @pytest.mark.django_db
     def test_block_with_block(self, django_db_blocker: DjangoDbBlocker) -> None:
         with django_db_blocker.block():
-            with pytest.raises(RuntimeError, match="^Database access not allowed,"):
+            with pytest.raises(RuntimeError, match=r"^Database access not allowed,"):
                 Item.objects.exists()
 
     def test_unblock_manually(self, django_db_blocker: DjangoDbBlocker) -> None: