From 04ff88139a70bcc852480229672626de7e620b9f Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 8 Apr 2021 12:09:48 +0100
Subject: [PATCH] Update tox.ini to remove py35

---
 tox.ini | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tox.ini b/tox.ini
index b2bc6f23e..998b04b22 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,8 @@
 [tox]
-envlist = packaging, py35, py36, py37, py38, py39, check_codestyle, check_isort
+envlist = packaging, py36, py37, py38, py39, check_codestyle, check_isort
+
+# we require tox>=2.3.2 for the fix to https://github.com/tox-dev/tox/issues/208
+minversion = 2.3.2
 
 [base]
 deps =
@@ -48,6 +51,7 @@ deps =
 extras =
     # install the optional dependendencies for tox environments without
     # '-noextras' in their name
+    # (this requires tox 3)
     !noextras: all
     test
 
@@ -74,8 +78,6 @@ commands =
     # we use "env" rather than putting a value in `setenv` so that it is not
     # inherited by other tox environments.
     #
-    # keep this in sync with the copy in `testenv:py3-old`.
-    #
     /usr/bin/env COVERAGE_PROCESS_START={toxinidir}/.coveragerc "{envbindir}/trial" {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}
 
 # As of twisted 16.4, trial tries to import the tests as a package (previously
@@ -121,11 +123,7 @@ commands =
     # Install Synapse itself. This won't update any libraries.
     pip install -e ".[test]"
 
-    # we have to duplicate the command from `testenv` rather than refer to it
-    # as `{[testenv]commands}`, because we run on ubuntu xenial, which has
-    # tox 2.3.1, and https://github.com/tox-dev/tox/issues/208.
-    #
-    /usr/bin/env COVERAGE_PROCESS_START={toxinidir}/.coveragerc "{envbindir}/trial" {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}
+    {[testenv]commands}
 
 [testenv:benchmark]
 deps =