fixup! Test on min versions of all deps, not just six

gsnedders · gsnedders · commit 7df5bd381a27 · 2017-02-20T22:47:51.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,13 @@ env:
   - USE_OPTIONAL=false
   - DEP_VERSION=min USE_OPTIONAL=true
 
+matrix:
+  include:
+    - python: "2.6"
+      env: PIP_VERSION=6.1.0 DEP_VERSION=min USE_OPTIONAL=true
+    - python: "3.3"
+      env: PIP_VERSION=6.1.0 DEP_VERSION=min USE_OPTIONAL=true
+
 install:
   - ./requirements-install.sh
 
diff --git a/requirements-install.sh b/requirements-install.sh
@@ -1,6 +1,10 @@
 #!/bin/bash -ex
 
-pip install pip==6.1.0
+if [[ $PIP_VERSION ]]; then
+  pip install "pip==$PIP_VERSION"
+else
+  pip install -U pip setuptools wheel
+fi
 
 if [[ $DEP_VERSION == "min" ]]; then
   sed -i'' -e 's/>=/==/g' requirements*.txt
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -3,6 +3,6 @@
 flake8==2.6.2
 pycodestyle==2.0.0
 pyflakes==1.2.3
-pytest>=2.7,<4.0
+pytest>=2.7.3,<4.0
 pytest-expect>=1.1,<2.0
 mock>=0.7,<3.0
diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,7 @@ deps =
   flake8==2.6.2
   pycodestyle==2.0.0
   pyflakes==1.2.3
-  pytest>=2.7,<4.0
+  pytest>=2.7.3,<4.0
   pytest-expect>=1.1,<2.0
   mock>=0.7,<3.0
   base: six>=1.9,<2.0
