Rely on tox-pip-version to upgrade pip and minimize the hack for removing setuptools from the environment.

1 files changed, 5 insertions, 3 deletions

diff --git a/tox.ini b/tox.ini
index 6a1af56e..a666f0af 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,15 +6,17 @@
 
 [tox]
 envlist=python
+minversion = 3.2
+requires =
+	tox-pip-version >= 0.0.6
 
 [helpers]
-# Wrapper for calls to pip that make sure the version being used is a
-# up-to-date, and to prevent the current working directory from being
-# added to `sys.path`.
+# Custom pip behavior
 pip = python {toxinidir}/tools/tox_pip.py
 
 [testenv]
 deps=-r{toxinidir}/tests/requirements.txt
+pip_version = pip
 install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}