Merge branch 'master' into master

jazzband · Jun 1, 2021 · 77af4d2 · 77af4d2
2 parents bc2034f + d14f19e
commit 77af4d2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/tox.ini b/tox.ini
@@ -11,12 +11,16 @@ 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
     pipmain: -e git+https://github.com/pypa/pip.git@main#egg=pip
     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