Use pip version file

dstansby · dstansby · commit 0901f79ba1b0 · 2018-06-22T14:46:59.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -50,6 +50,10 @@ env:
     - secure: dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU=
     # Variables controlling the build.
     - MPLLOCALFREETYPE=1
+    # Variable for the location of an extra pip requirement file
+    - EXTRAREQS=
+    # Variable for the location of a pip version file
+    - PINNEDVERS=
     # Variables controlling the test run.
     - DELETE_FONT_CACHE=
     - NO_AT_BRIDGE=1  # Necessary for GTK3 interactive test.
@@ -67,15 +71,15 @@ matrix:
     - python: 3.5
       # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
       env:
-        - EXTRAREQS='requirements/testing/travis35.txt'
+        - PINNEDVERS='-c requirements/testing/travis35.txt'
     - python: 3.5
       env:
         # - PYTHONOPTIMIZE=2  # This currently doesn't work.
     - python: 3.6
       env:
         - DELETE_FONT_CACHE=1
         - PYTEST_ADDOPTS="$PYTEST_ADDOPTS --pep8"
-        - EXTRAREQS='requirements/testing/travis36.txt'
+        - EXTRAREQS='-r requirements/testing/travis36.txt'
     - python: "nightly"
       env: PRE=--pre
     - os: osx
@@ -119,8 +123,7 @@ install:
     python -mpip install --upgrade pip setuptools wheel
   - |
     # Install dependencies from PyPI.
-    python -mpip install --upgrade $PRE -r requirements/testing/travis_all.txt
-    python -mpip install --upgrade $PRE -r $EXTRAREQS
+    python -mpip install --upgrade $PRE -r requirements/testing/travis_all.txt $EXTRAREQS $PINNEDVERS
     # GUI toolkits are pip-installable only for some versions of Python so
     # don't fail if we can't install them.  Make it easier to check whether the
     # install was successful by trying to import the toolkit (sometimes, the
diff --git a/requirements/testing/travis35.txt b/requirements/testing/travis35.txt
@@ -2,7 +2,6 @@
 
 cycler==0.10
 python-dateutil==2.1
-nose
 numpy==1.10.0
 pandas<0.21.0
 pyparsing==2.0.1
