From 108749dda54b944ee15983be2222061d79125106 Mon Sep 17 00:00:00 2001
From: Stephen Rosen <sirosen@globus.org>
Date: Mon, 4 May 2026 11:15:10 -0500
Subject: [PATCH] Make tox factor usage more extensible

Previously, the test environments were binary flagged between `mindeps`
and `!mindeps`. This is unfortunately bad for adding additional factors,
as discovered when testing `orjson` as a factor. Because `tox` does not
allow negative factors to be layered with "OR" semantics, it becomes
difficult to deselect the locked requirements in `test.txt` in order
to replace them.

The base testenv is simplified to have unconditional dependencies, and
factor-based dependency selection is done in descendant envs which can
therefore fully replace the deps declared by the base env.

The change in configuration also provides an opportunity to refactor the
`depends` declaration into the list form which makes it inheritable.
---
 tox.ini | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5f74c0ae1..c842d66ee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,31 +18,36 @@ labels =
 # build a wheel, not a tarball, and use a common env to do it (so that the wheel is shared)
 package = wheel
 wheel_build_env = build_wheel
+deps = -r requirements/py{py_dot_ver}/test.txt
+commands = coverage run -m pytest {posargs}
+depends = coverage_clean,lint
 
+[testenv:py{3.14,3.13,3.12,3.11,3.10,3.9}-mindeps]
+deps = -r requirements/py{py_dot_ver}/test-mindeps.txt
+
+[testenv:py{3.14,3.13,3.12,3.11,3.10,3.9}-sphinxext]
 deps =
-    !mindeps: -r requirements/py{py_dot_ver}/test.txt
-    mindeps: -r requirements/py{py_dot_ver}/test-mindeps.txt
-    sphinxext: -r requirements/py{py_dot_ver}/docs.txt
-commands = coverage run -m pytest {posargs}
-depends =
-    py{3.14,3.13,3.12,3.11,3.10,3.9}{-mindeps,-sphinxext,}: coverage_clean, lint
-    coverage_report: py{3.14,3.13,3.12,3.11,3.10,3.9}{-mindeps,-sphinxext,}
+    -r requirements/py{py_dot_ver}/test.txt
+    -r requirements/py{py_dot_ver}/docs.txt
 
 [testenv:coverage_clean]
 dependency_groups = coverage
 skip_install = true
 commands = coverage erase
+depends =
 
 [testenv:coverage_report]
 dependency_groups = coverage
 skip_install = true
 commands_pre = -coverage combine
 commands = coverage report --skip-covered
+depends = py{3.14,3.13,3.12,3.11,3.10,3.9}{-mindeps,-sphinxext,}
 
 [testenv:lint]
 deps = pre-commit
 skip_install = true
 commands = pre-commit run --all-files
+depends =
 
 [testenv:mypy,mypy-{py3.9,py3.14}]
 deps = -r requirements/py{py_dot_ver}/typing.txt