Merge pull request #11480 from QuLogic/fix-macos

dstansby · web-flow · commit 589f07170ecb · 2018-06-22T12:18:44.000+02:00
Skip pillow 5.1.0 on macOS
diff --git a/.travis.yml b/.travis.yml
@@ -51,6 +51,7 @@ env:
     - NOSE=
     - NUMPY=numpy
     - PANDAS=
+    - PILLOW=pillow
     - PYPARSING=pyparsing
     - PYTEST='pytest!=3.3.0,>=3.2.0'
     - PYTEST_COV=pytest-cov
@@ -87,7 +88,9 @@ matrix:
     - os: osx
       osx_image: xcode7.3
       language: generic  # https://github.com/travis-ci/travis-ci/issues/2312
-      env: MOCK=mock
+      env:
+        - MOCK=mock
+        - PILLOW='pillow!=5.1.0'
       only: master
       cache:
         # As for now travis caches only "$HOME/.cache/pip"
@@ -139,7 +142,7 @@ install:
         $PANDAS \
         codecov \
         coverage \
-        pillow \
+        $PILLOW \
         $PYPARSING \
         $DATEUTIL \
         $SPHINX
