Install mock unconditionally

mdboom · mdboom · commit 4a9d8708e97f · 2015-10-27T11:36:45.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -35,16 +35,16 @@ language: python
 matrix:
   include:
     - python: 2.6
-      env: NUMPY=numpy==1.6 MOCK=mock
+      env: NUMPY=numpy==1.6
     - python: 2.7
-      env: MOCK=mock PANDAS=pandas
+      env: PANDAS=pandas
     - python: 3.3
     - python: 3.4
     - python: 3.5
     - python: 2.7
       env: TEST_ARGS=--pep8
     - python: 2.7
-      env: BUILD_DOCS=true MOCK=mock
+      env: BUILD_DOCS=true
     - python: "nightly"
       env: PRE=--pre
   allow_failures:
@@ -64,21 +64,14 @@ install:
     pip install --upgrade setuptools
   # Install only from travis wheelhouse
   - if [ -z "$PRE" ]; then
-        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing pillow sphinx!=1.3.0;
+        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing pillow sphinx!=1.3.0 mock;
     else
-        pip install $PRE python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0;
+        pip install $PRE python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0 mock;
     fi
   # Always install from pypi
   - pip install $PRE pep8 cycler
   - 'pip install https://github.com/tacaswell/nose/zipball/mnt_py36_compat#egg=nose'
 
-  # Install mock on python 2. Python 2.6 requires mock 1.0.1
-  # Since later versions have dropped support
-  - |
-    if [[ -n "$MOCK"  ]]; then
-      echo $MOCK
-      pip install $MOCK
-    fi;
   # We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
   # availible in the Ubuntu version used by Travis but we can manually install the deb from a later
   # version since is it basically just a .ttf file
