From f218d5d4b64a80c239ddf66309f08bfc3640df0b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 29 Jul 2016 08:51:23 +0200
Subject: [PATCH] Try harder to pin pip/setuptools

---
 misc/requirements/requirements-pip.txt |  2 ++
 tox.ini                                | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index 284329c29..a0be27eba 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -1 +1,3 @@
 pip==8.1.2
+# https://github.com/pypa/setuptools/issues/702
+setuptools==25.1.0  # rq.filter: != 25.1.1
diff --git a/tox.ini b/tox.ini
index e88661719..2e7b005f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ setenv =
     PYTEST_QT_API=pyqt5
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_*
 deps =
+    -r{toxinidir}/misc/requirements/requirements-pip.txt
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-tests.txt
 commands =
@@ -74,7 +75,7 @@ ignore_errors = true
 basepython = python3
 # For global .gitignore files
 passenv = HOME
-deps =
+deps = -r{toxinidir}/misc/requirements/requirements-pip.txt
 commands =
     {envpython} scripts/dev/misc_checks.py git
     {envpython} scripts/dev/misc_checks.py vcs
@@ -82,7 +83,9 @@ commands =
 
 [testenv:vulture]
 basepython = python3
-deps = -r{toxinidir}/misc/requirements/requirements-vulture.txt
+deps =
+    -r{toxinidir}/misc/requirements/requirements-pip.txt
+    -r{toxinidir}/misc/requirements/requirements-vulture.txt
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} scripts/dev/run_vulture.py
@@ -141,6 +144,7 @@ skip_install = true
 whitelist_externals = git
 passenv = TRAVIS_PULL_REQUEST
 deps =
+    -r{toxinidir}/misc/requirements/requirements-pip.txt
     -r{toxinidir}/requirements.txt
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
@@ -154,6 +158,7 @@ commands =
 basepython = {env:PYTHON:}/python.exe
 skip_install = true
 deps =
+    -r{toxinidir}/misc/requirements/requirements-pip.txt
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-cxfreeze.txt
 commands =
@@ -165,6 +170,7 @@ commands =
 basepython = python3
 skip_install = true
 deps =
+    -r{toxinidir}/misc/requirements/requirements-pip.txt
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt
 commands =
@@ -173,6 +179,6 @@ commands =
 
 [testenv:eslint]
 skip_install = True
-deps =
+deps = -r{toxinidir}/misc/requirements/requirements-pip.txt
 whitelist_externals = eslint
 commands = eslint qutebrowser