From fb51e6ba205d8026cfaeb92684867a0fe765153b Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 28 Apr 2024 22:43:03 +0300
Subject: [PATCH 1/6] tox: some cleanups & remove hardcoded python3.10

---
 tox.ini | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/tox.ini b/tox.ini
index 6a3e9db..3092158 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,34 +1,26 @@
 [tox]
-envlist=
+envlist =
   linting
   py{38,39,310,311,312}-pytestlatest
   py310-pytestmain
   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
@@ -39,9 +31,8 @@ deps =
 commands = pre-commit run --all-files --show-diff-on-failure
 
 [testenv:release]
-changedir=
+changedir =
 description = do a release, required posarg of the version number
-basepython = python3.10
 skipsdist = True
 usedevelop = True
 passenv = *
@@ -51,7 +42,6 @@ commands =
   towncrier build --version {posargs} --yes
 
 [testenv:docs]
-basepython = python3.10
 usedevelop = True
 deps =
     sphinx

From d204fdf9658882abecb3b4ea5992882a20cfa3f0 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 28 Apr 2024 22:48:51 +0300
Subject: [PATCH 2/6] 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

From a9a3d13a29c37489845586ee4ec25204e376b203 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 28 Apr 2024 22:51:26 +0300
Subject: [PATCH 3/6] pyproject: remove setuptools `platforms` key

According to
https://packaging.python.org/en/latest/specifications/core-metadata/#platform-multiple-use
this is redundant with the classifiers.
---
 pyproject.toml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4dee33b..89c52dd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,11 +56,6 @@ setproctitle = ["setproctitle"]
 
 [tool.setuptools]
 zip-safe = false
-platforms = [
-    "linux",
-    "osx",
-    "win32",
-]
 include-package-data = false
 
 [tool.setuptools_scm]

From 6d54a6b2e36ae28392d2ce0f3cd30e8a8d8466f6 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 28 Apr 2024 22:52:30 +0300
Subject: [PATCH 4/6] pyproject: remove setuptools `zip-safe` key

According to
https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html#setuptools-specific-configuration
it's no longer relevant.
---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 89c52dd..9b3844a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,7 +55,6 @@ psutil = ["psutil>=3.0"]
 setproctitle = ["setproctitle"]
 
 [tool.setuptools]
-zip-safe = false
 include-package-data = false
 
 [tool.setuptools_scm]

From 7c83841a3d01544ee589405c7e3e549ec18b64de Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 28 Apr 2024 22:54:31 +0300
Subject: [PATCH 5/6] pyproject: remove setuptools `include-package-data =
 false`

I compared the sdists and wheels and it makes no difference.
---
 pyproject.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9b3844a..8e5e817 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,9 +54,6 @@ testing = ["filelock"]
 psutil = ["psutil>=3.0"]
 setproctitle = ["setproctitle"]
 
-[tool.setuptools]
-include-package-data = false
-
 [tool.setuptools_scm]
 write_to = "src/xdist/_version.py"
 

From 64469f56a3ea34d6bc1389dcdfb35defb130d9e2 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 28 Apr 2024 22:57:56 +0300
Subject: [PATCH 6/6] MANIFEST.in: remove

I don't think a few unnecessary dot files bother anyone, and may
arguably be useful to someone.
---
 MANIFEST.in | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index c0928d5..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,5 +0,0 @@
-exclude .appveyor.yml
-exclude .gitignore
-exclude .pre-commit-config.yaml
-exclude .travis.yml
-prune .github