Merge pull request #1077 from bluetech/tox-tweak

Some tox/build/config tweaks

MANIFEST.in

@@ -1,5 +0,0 @@
-exclude .appveyor.yml
-exclude .gitignore
-exclude .pre-commit-config.yaml
-exclude .travis.yml
-prune .github

pyproject.toml

@@ -54,18 +54,15 @@ testing = ["filelock"]
 psutil = ["psutil>=3.0"]
 setproctitle = ["setproctitle"]
 
-[tool.setuptools]
-zip-safe = false
-platforms = [
-    "linux",
-    "osx",
-    "win32",
-]
-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"]
 

tox.ini

@@ -6,29 +6,21 @@ envlist=
   py310-psutil
   py310-setproctitle
 isolated_build = true
+
 [testenv]
-extras = testing
+extras =
+  testing
+  psutil: psutil
+  setproctitle: setproctitle
 deps =
   pytestmin: pytest==7.0.0
   pytestlatest: pytest
   pytestmain: git+https://github.com/pytest-dev/pytest.git
 commands =
-  pytest {posargs}
-
-[testenv:py310-psutil]
-extras =
-  testing
-  psutil
-commands =
-  pytest {posargs:-k psutil}
-
-[testenv:py310-setproctitle]
-extras =
-  testing
-  setproctitle
-deps = pytest
-commands =
-  pytest {posargs}
+  pytest {posargs:{env:_XDIST_TOX_DEFAULT_POSARGS:}}
+setenv =
+  _XDIST_TOX_DEFAULT_POSARGS={env:_XDIST_TOX_POSARGS_PSUTIL:}
+  psutil: _XDIST_TOX_POSARGS_PSUTIL=-k psutil
 
 [testenv:linting]
 skip_install = True
@@ -41,7 +33,6 @@ commands = pre-commit run --all-files --show-diff-on-failure
 [testenv:release]
 changedir =
 description = do a release, required posarg of the version number
-basepython = python3.10
 skipsdist = True
 usedevelop = True
 passenv = *
@@ -51,16 +42,9 @@ commands =
   towncrier build --version {posargs} --yes
 
 [testenv:docs]
-basepython = python3.10
 usedevelop = True
 deps =
     sphinx
     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