From f0b98aead562495f7f2019dd886b4e61c5fe68f9 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 28 Apr 2023 13:32:42 -0400
Subject: [PATCH] You don't need tox *inside* your test environment.

You need tox to *manage* your test environment (this is the premise, at least).
---
 .circleci/setup-virtualenv.sh | 4 ++++
 setup.py                      | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/setup-virtualenv.sh b/.circleci/setup-virtualenv.sh
index 7087c5120..7fc6dc528 100755
--- a/.circleci/setup-virtualenv.sh
+++ b/.circleci/setup-virtualenv.sh
@@ -28,6 +28,10 @@ shift || :
 export PIP_FIND_LINKS="file://${WHEELHOUSE_PATH}"
 export PIP_NO_INDEX="1"
 
+# Get tox inside the bootstrap virtualenv since we use tox to manage the rest
+# of the environment.
+"${BOOTSTRAP_VENV}"/bin/pip install "tox~=3.0"
+
 # Get everything else installed in it, too.
 "${BOOTSTRAP_VENV}"/bin/tox \
      -c "${PROJECT_ROOT}"/tox.ini \
diff --git a/setup.py b/setup.py
index d823029e2..bac93a4bb 100644
--- a/setup.py
+++ b/setup.py
@@ -416,7 +416,6 @@ setup(name="tahoe-lafs", # also set in __init__.py
               "pip==22.0.3",
               "wheel==0.37.1",
               "setuptools==60.9.1",
-              "tox~=3.0",
               "subunitreporter==22.2.0",
               "python-subunit==1.4.2",
               "junitxml==0.7",