Merge branch 'main' into dev/remote-PT023

Author: kingbuzzman

.github/workflows/main.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.11.1
+          pip install tox==4.26.0
 
       - name: Run tox
         run: tox -e ${{ matrix.name }}

Makefile

@@ -40,7 +40,7 @@ classifiers = [
 dependencies = [
     "pytest>=7.0.0",
 ]
-[project.optional-dependencies]
+[dependency-groups]
 docs = [
     "sphinx",
     "sphinx_rtd_theme",
@@ -49,6 +49,23 @@ testing = [
     "Django",
     "django-configurations>=2.0",
 ]
+coverage = [
+    "coverage[toml]",
+    "coverage-enable-subprocess",
+]
+postgres = [
+    "psycopg[binary]",
+]
+mysql = [
+    "mysqlclient==2.1.0",
+]
+xdist = [
+    "pytest-xdist",
+]
+linting = [
+    "ruff==0.9.5",
+    "mypy==1.15.0",
+]
 [project.urls]
 Documentation = "https://pytest-django.readthedocs.io/"
 Repository = "https://github.com/pytest-dev/pytest-django"
@@ -137,7 +154,6 @@ extend-select = [
 ignore = [
     "PLR0913",  # Too many arguments in function definition
     "PLR2004",  # Magic value used in comparison, consider replacing 3 with a constant variable
-    "PT001",    # Use `@pytest.fixture()` over `@pytest.fixture`
 ]
 
 [tool.ruff.lint.isort]

pyproject.toml

@@ -201,7 +201,7 @@ def django_db_setup(
                 )
 
 
-@pytest.fixture()
+@pytest.fixture
 def _django_db_helper(
     request: pytest.FixtureRequest,
     django_db_setup: None,
@@ -365,7 +365,7 @@ def _set_suffix_to_test_databases(suffix: str) -> None:
 # ############### User visible fixtures ################
 
 
-@pytest.fixture()
+@pytest.fixture
 def db(_django_db_helper: None) -> None:
     """Require a django test database.
 
@@ -382,7 +382,7 @@ def db(_django_db_helper: None) -> None:
     # The `_django_db_helper` fixture checks if `db` is requested.
 
 
-@pytest.fixture()
+@pytest.fixture
 def transactional_db(_django_db_helper: None) -> None:
     """Require a django test database with transaction support.
 
@@ -398,7 +398,7 @@ def transactional_db(_django_db_helper: None) -> None:
     # The `_django_db_helper` fixture checks if `transactional_db` is requested.
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_db_reset_sequences(
     _django_db_helper: None,
     transactional_db: None,
@@ -414,7 +414,7 @@ def django_db_reset_sequences(
     # is requested.
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_db_serialized_rollback(
     _django_db_helper: None,
     db: None,
@@ -435,7 +435,7 @@ def django_db_serialized_rollback(
     # is requested.
 
 
-@pytest.fixture()
+@pytest.fixture
 def client() -> django.test.Client:
     """A Django test client instance."""
     skip_if_no_django()
@@ -445,7 +445,7 @@ def client() -> django.test.Client:
     return Client()
 
 
-@pytest.fixture()
+@pytest.fixture
 def async_client() -> django.test.AsyncClient:
     """A Django test async client instance."""
     skip_if_no_django()
@@ -455,22 +455,22 @@ def async_client() -> django.test.AsyncClient:
     return AsyncClient()
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_user_model(db: None):
     """The class of Django's user model."""
     from django.contrib.auth import get_user_model
 
     return get_user_model()
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_username_field(django_user_model) -> str:
     """The fieldname for the username used with Django's user model."""
     field: str = django_user_model.USERNAME_FIELD
     return field
 
 
-@pytest.fixture()
+@pytest.fixture
 def admin_user(
     db: None,
     django_user_model,
@@ -501,7 +501,7 @@ def admin_user(
     return user
 
 
-@pytest.fixture()
+@pytest.fixture
 def admin_client(
     db: None,
     admin_user,
@@ -514,7 +514,7 @@ def admin_client(
     return client
 
 
-@pytest.fixture()
+@pytest.fixture
 def rf() -> django.test.RequestFactory:
     """RequestFactory instance"""
     skip_if_no_django()
@@ -524,7 +524,7 @@ def rf() -> django.test.RequestFactory:
     return RequestFactory()
 
 
-@pytest.fixture()
+@pytest.fixture
 def async_rf() -> django.test.AsyncRequestFactory:
     """AsyncRequestFactory instance"""
     skip_if_no_django()
@@ -569,7 +569,7 @@ def finalize(self) -> None:
         del self._to_restore[:]
 
 
-@pytest.fixture()
+@pytest.fixture
 def settings():
     """A Django settings object which restores changes after the testrun"""
     skip_if_no_django()
@@ -702,13 +702,13 @@ def _assert_num_queries(
             pytest.fail(msg)
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_assert_num_queries(pytestconfig: pytest.Config) -> DjangoAssertNumQueries:
     """Allows to check for an expected number of DB queries."""
     return partial(_assert_num_queries, pytestconfig)
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_assert_max_num_queries(pytestconfig: pytest.Config) -> DjangoAssertNumQueries:
     """Allows to check for an expected maximum number of DB queries."""
     return partial(_assert_num_queries, pytestconfig, exact=False)
@@ -726,7 +726,7 @@ def __call__(
         pass  # pragma: no cover
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_capture_on_commit_callbacks() -> DjangoCaptureOnCommitCallbacks:
     """Captures transaction.on_commit() callbacks for the given database connection."""
     from django.test import TestCase

pytest_django/fixtures.py

@@ -605,7 +605,7 @@ def _dj_autoclear_mailbox() -> None:
         mail.outbox.clear()
 
 
-@pytest.fixture()
+@pytest.fixture
 def mailoutbox(
     django_mail_patch_dns: None,
     _dj_autoclear_mailbox: None,
@@ -620,7 +620,7 @@ def mailoutbox(
     return []
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_mail_patch_dns(
     monkeypatch: pytest.MonkeyPatch,
     django_mail_dnsname: str,
@@ -631,7 +631,7 @@ def django_mail_patch_dns(
     monkeypatch.setattr(mail.message, "DNS_NAME", django_mail_dnsname)
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_mail_dnsname() -> str:
     """Return server dns name for using in email messages."""
     return "fake-tests.example.com"

pytest_django/plugin.py

@@ -46,7 +46,7 @@ def pytester(pytester: pytest.Pytester, monkeypatch: pytest.MonkeyPatch) -> pyte
     return pytester
 
 
-@pytest.fixture()
+@pytest.fixture
 def django_pytester(
     request: pytest.FixtureRequest,
     pytester: pytest.Pytester,

tests/conftest.py

@@ -8,22 +8,19 @@ envlist =
     linting
 
 [testenv]
-extras = testing
+dependency_groups =
+    testing
+    coverage: coverage
+    mysql: mysql
+    postgres: postgres
+    xdist: xdist
 deps =
     djmain: https://github.com/django/django/archive/main.tar.gz
     dj52: Django>=5.2a1,<6.0
     dj51: Django>=5.1,<5.2
     dj50: Django>=5.0,<5.1
     dj42: Django>=4.2,<4.3
-
-    mysql: mysqlclient==2.1.0
-
-    postgres: psycopg[binary]
-    coverage: coverage[toml]
-    coverage: coverage-enable-subprocess
-
     pytestmin: pytest>=7.0,<7.1
-    xdist: pytest-xdist>=1.15
 
 setenv =
     mysql: DJANGO_SETTINGS_MODULE=pytest_django_test.settings_mysql
@@ -46,26 +43,21 @@ commands =
     coverage: coverage xml
 
 [testenv:linting]
-extras =
-deps =
-    ruff==0.9.5
-    mypy==1.15.0
+dependency_groups = linting
 commands =
     ruff check --diff {posargs:pytest_django pytest_django_test tests}
     ruff format --quiet --diff {posargs:pytest_django pytest_django_test tests}
     mypy {posargs:pytest_django pytest_django_test tests}
 
 [testenv:doc8]
-extras =
 basepython = python3
 skip_install = true
+dependency_groups = docs
 deps =
-    sphinx
     doc8
 commands =
     doc8 docs/
 
 [testenv:docs]
-deps =
-extras = docs
+dependency_groups = docs
 commands = sphinx-build -n -W -b html -d docs/_build/doctrees docs docs/_build/html