@@ -35,16 +35,16 @@ language: python
3535matrix :
3636include :
3737 -python :2.6
38- env :NUMPY=numpy==1.6 MOCK=mock
38+ env :NUMPY=numpy==1.6
3939 -python :2.7
40- env :MOCK=mock PANDAS=pandas
40+ env :PANDAS=pandas
4141 -python :3.3
4242 -python :3.4
4343 -python :3.5
4444 -python :2.7
4545env :TEST_ARGS=--pep8
4646 -python :2.7
47- env :BUILD_DOCS=true MOCK=mock
47+ env :BUILD_DOCS=true
4848 -python :" nightly"
4949env :PRE=--pre
5050allow_failures :
@@ -64,21 +64,14 @@ install:
6464 pip install --upgrade setuptools
6565# Install only from travis wheelhouse
6666 -if [ -z "$PRE" ]; then
67- wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing pillow sphinx!=1.3.0;
67+ wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing pillow sphinx!=1.3.0 mock ;
6868else
69- pip install $PRE python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0;
69+ pip install $PRE python-dateutil $NUMPY pyparsing pillow sphinx!=1.3.0 mock ;
7070fi
7171# Always install from pypi
7272 -pip install $PRE pep8 cycler
7373 -' pip install https://github.com/tacaswell/nose/zipball/mnt_py36_compat#egg=nose'
7474
75- # Install mock on python 2. Python 2.6 requires mock 1.0.1
76- # Since later versions have dropped support
77- -|
78- if [[ -n "$MOCK" ]]; then
79- echo $MOCK
80- pip install $MOCK
81- fi;
8275# We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
8376# availible in the Ubuntu version used by Travis but we can manually install the deb from a later
8477# version since is it basically just a .ttf file