Skip to content

Commit d204fdf

Browse files
committed
pyproject: move pytest config from tox.ini
1 parent fb51e6b commit d204fdf

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pyproject.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ include-package-data = false
6666
[tool.setuptools_scm]
6767
write_to = "src/xdist/_version.py"
6868

69+
[tool.pytest.ini_options]
70+
# pytest-services also defines a worker_id fixture, disable
71+
# it so they don't conflict with each other (#611).
72+
addopts = "-ra -p no:pytest-services"
73+
testpaths = ["testing"]
74+
6975
[tool.ruff]
7076
src = ["src"]
7177

tox.ini

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,3 @@ deps =
4848
sphinx_rtd_theme
4949
commands =
5050
sphinx-build -W --keep-going -b html docs docs/_build/html {posargs:}
51-
52-
[pytest]
53-
# pytest-services also defines a worker_id fixture, disable
54-
# it so they don't conflict with each other (#611).
55-
addopts = -ra -p no:pytest-services
56-
testpaths = testing

0 commit comments

Comments
 (0)