From d204fdf9658882abecb3b4ea5992882a20cfa3f0 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sun, 28 Apr 2024 22:48:51 +0300 Subject: [PATCH] pyproject: move pytest config from tox.ini --- pyproject.toml | 6 ++++++ tox.ini | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d65a24d..4dee33b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,6 +66,12 @@ include-package-data = false [tool.setuptools_scm] write_to = "src/xdist/_version.py" +[tool.pytest.ini_options] +# pytest-services also defines a worker_id fixture, disable +# it so they don't conflict with each other (#611). +addopts = "-ra -p no:pytest-services" +testpaths = ["testing"] + [tool.ruff] src = ["src"] diff --git a/tox.ini b/tox.ini index 3092158..f583173 100644 --- a/tox.ini +++ b/tox.ini @@ -48,9 +48,3 @@ deps = sphinx_rtd_theme commands = sphinx-build -W --keep-going -b html docs docs/_build/html {posargs:} - -[pytest] -# pytest-services also defines a worker_id fixture, disable -# it so they don't conflict with each other (#611). -addopts = -ra -p no:pytest-services -testpaths = testing