File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Open diff view settings
Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Open diff view settings
Original file line number Diff line number Diff line change @@ -34,14 +34,15 @@ language: python
3434matrix :
3535 include :
3636 - python : 2.6
37- env : NUMPY=numpy==1.6
37+ env : NUMPY=numpy==1.6 MOCK=true
3838 - python : 2.7
39+ env : MOCK=true
3940 - python : 3.3
4041 - python : 3.4
4142 - python : 2.7
4243 env : TEST_ARGS=--pep8
4344 - python : 2.7
44- env : BUILD_DOCS=true
45+ env : BUILD_DOCS=true MOCK=true
4546 - python : " nightly"
4647 env : PRE=--pre
4748 allow_failures :
@@ -63,6 +64,12 @@ install:
6364 # Always install from pypi
6465 - pip install $PRE nose pep8
6566
67+ # Install mock on python 2. We limit to 1.0.1 at the moment
68+ # https://github.com/matplotlib/matplotlib/issues/4613
69+ - |
70+ if [[ $MOCK == true ]]; then
71+ pip install mock==1.0.1
72+ fi;
6673 # We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
6774 # availible in the Ubuntu version used by Travis but we can manually install the deb from a later
6875 # version since is it basically just a .ttf file
You can’t perform that action at this time.
0 commit comments