From 7807c1a2de7212998b729462661f4d7fdd59b2f9 Mon Sep 17 00:00:00 2001
From: Nico Albers <nico.albers@aboutyou.com>
Date: Fri, 28 May 2021 14:34:52 +0200
Subject: [PATCH 1/4] fix failing tox tests by disabling pip version check  on
 old version and using newest feature in new version

---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index d951f211e..3ade13897 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,6 +17,8 @@ deps =
     pip20.3: pip==20.3.*
 setenv =
     coverage: PYTEST_ADDOPTS=--strict --doctest-modules --cov --cov-report=term-missing --cov-report=xml {env:PYTEST_ADDOPTS:}
+        pipprevious,pip20.3: PIP_DISABLE_PIP_VERSION_CHECK=1
+        piplatest: PIP_USE_FEATURE=in-tree-build
 commands_pre =
     piplatest: python -m pip install -U pip
     pip --version

From 5c1876cbfa61f96f323e7b00f64269f21989ee5b Mon Sep 17 00:00:00 2001
From: Nico Albers <nico.albers@aboutyou.com>
Date: Fri, 28 May 2021 15:42:05 +0200
Subject: [PATCH 2/4] test restricting setuptools to old version <57

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 3ade13897..f16c5b860 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,7 @@ deps =
     piplatest: pip
     pipmain: -e git+https://github.com/pypa/pip.git@main#egg=pip
     pip20.3: pip==20.3.*
+    setuptools<=57
 setenv =
     coverage: PYTEST_ADDOPTS=--strict --doctest-modules --cov --cov-report=term-missing --cov-report=xml {env:PYTEST_ADDOPTS:}
         pipprevious,pip20.3: PIP_DISABLE_PIP_VERSION_CHECK=1

From ac285555994e5e3722999511e6f87b7bafc5f2d4 Mon Sep 17 00:00:00 2001
From: Nico Albers <nico.albers@aboutyou.com>
Date: Fri, 28 May 2021 15:48:16 +0200
Subject: [PATCH 3/4] restrict to proper version number

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index f16c5b860..4761b87d0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,11 +11,11 @@ extras =
     testing
     coverage: coverage
 deps =
+    setuptools<57
     pipprevious: pip==20.3.*
     piplatest: pip
     pipmain: -e git+https://github.com/pypa/pip.git@main#egg=pip
     pip20.3: pip==20.3.*
-    setuptools<=57
 setenv =
     coverage: PYTEST_ADDOPTS=--strict --doctest-modules --cov --cov-report=term-missing --cov-report=xml {env:PYTEST_ADDOPTS:}
         pipprevious,pip20.3: PIP_DISABLE_PIP_VERSION_CHECK=1

From 0cc13ada30439f8fab5de987464be107d58a05e1 Mon Sep 17 00:00:00 2001
From: Nico Albers <nico.albers@aboutyou.com>
Date: Sat, 29 May 2021 16:32:59 +0200
Subject: [PATCH 4/4] align with comments from PR

---
 tox.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 4761b87d0..70435d676 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,7 @@ extras =
     testing
     coverage: coverage
 deps =
+    # due to broken CI, to be removed as soon as it is fixed, compare https://github.com/pypa/setuptools/issues/2687
     setuptools<57
     pipprevious: pip==20.3.*
     piplatest: pip
@@ -18,8 +19,8 @@ deps =
     pip20.3: pip==20.3.*
 setenv =
     coverage: PYTEST_ADDOPTS=--strict --doctest-modules --cov --cov-report=term-missing --cov-report=xml {env:PYTEST_ADDOPTS:}
-        pipprevious,pip20.3: PIP_DISABLE_PIP_VERSION_CHECK=1
-        piplatest: PIP_USE_FEATURE=in-tree-build
+    pipprevious,pip20.3: PIP_DISABLE_PIP_VERSION_CHECK=1
+    piplatest: PIP_USE_FEATURE=in-tree-build
 commands_pre =
     piplatest: python -m pip install -U pip
     pip --version