From 895a0ccb3c7271d87f6c38fcb1b0d8338a70925d Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Mon, 23 Oct 2023 17:39:27 -0700
Subject: [PATCH] Upgrade to tox 4. (Now a minimum requirement.)

---
 scripts/run-full-tests |  4 ++--
 tox.ini                | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/run-full-tests b/scripts/run-full-tests
index df362d0f..d18f2634 100755
--- a/scripts/run-full-tests
+++ b/scripts/run-full-tests
@@ -21,8 +21,8 @@ apk add --no-cache python3 py3-pip borgbackup postgresql-client mariadb-client m
     py3-ruamel.yaml py3-ruamel.yaml.clib py3-yaml bash sqlite fish
 # If certain dependencies of black are available in this version of Alpine, install them.
 apk add --no-cache py3-typed-ast py3-regex || true
-python3 -m pip install --no-cache --upgrade pip==22.2.2 setuptools==64.0.1 pymongo==4.4.1
-pip3 install --ignore-installed tox==3.25.1
+python3 -m pip install --no-cache --upgrade pip==22.2.2 setuptools==64.0.1
+pip3 install --ignore-installed tox==4.11.3
 export COVERAGE_FILE=/tmp/.coverage
 
 if [ "$1" != "--end-to-end-only" ]; then
diff --git a/tox.ini b/tox.ini
index 3a2b4764..6788ad9d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist = py37,py38,py39,py310,py311
+env_list = py37,py38,py39,py310,py311
 skip_missing_interpreters = True
-skipsdist = True
-minversion = 3.14.1
+package = editable
+min_version = 4.0
 
 [testenv]
-usedevelop = True
-deps = -rtest_requirements.txt
+deps =
+    -r test_requirements.txt
 whitelist_externals = 
     find
     sh
@@ -27,10 +27,12 @@ commands =
     pytest {posargs}
 
 [testenv:end-to-end]
-usedevelop = False
-deps = -rtest_requirements.txt
+package = editable
+deps =
+    -r test_requirements.txt
+    pymongo==4.4.1
        .
-passenv = COVERAGE_FILE
+pass_env = COVERAGE_FILE
 commands =
     pytest {posargs} --no-cov tests/end-to-end