Răsfoiți Sursa

Install pillow by conda for pyinstaller on Travis

Kentaro Wada 6 ani în urmă
părinte
comite
78f2a21ec0
1 a modificat fișierele cu 6 adăugiri și 6 ștergeri
  1. 6 6
      .travis.yml

+ 6 - 6
.travis.yml

@@ -68,12 +68,6 @@ install:
   - CONDA_DEPENDENCIES=$PYQT_PACKAGE source ci-helpers/travis/setup_conda.sh
   - source activate test && export LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH
   - pip install .
-  # https://github.com/wkentaro/labelme/issues/183
-  - |
-    if [ $TRAVIS_OS_NAME = "osx" ]; then
-      pip uninstall -y Pillow
-      conda install -y Pillow
-    fi
 
 before_script:
   - if [ $TRAVIS_OS_NAME = "linux" ]; then (herbstluftwm )& fi
@@ -96,6 +90,12 @@ after_script:
       # Cleanup
       pip uninstall -y $PIP_DEPENDENCIES
 
+      # https://github.com/wkentaro/labelme/issues/183
+      if [ $TRAVIS_OS_NAME = "osx" ]; then
+        pip uninstall -y Pillow
+        conda install -y Pillow
+      fi
+
       # Build the standalone executable
       pip install pyinstaller
       pyinstaller labelme.spec