Fail to use brew on Travis

e9d7e629 · Kentaro Wada · f9a39e7f · e9d7e629
隐藏空白更改
内联并排

Showing with 16 addition and 15 deletion

.travis.yml .travis.yml +16 -15

未找到文件。
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,20 +18,21 @@ matrix:
            - liblapack-dev
            - pyqt4-dev-tools
            - python-qt4
-    - os: osx
+    # FIXME: brew cannot be run on Travis.
-      osx_image: xcode8
+    # - os: osx
-      language: generic
+    #   osx_image: xcode8
-      env:
+    #   language: generic
-        - PYTHON_VERSION=2.7.10
+    #   env:
-        - PYENV_ROOT=~/.pyenv
+    #     - PYTHON_VERSION=2.7.10
-        - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    #     - PYENV_ROOT=~/.pyenv
-    - os: osx
+    #     - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-      osx_image: xcode9
+    # - os: osx
-      language: generic
+    #   osx_image: xcode9
-      env:
+    #   language: generic
-        - PYTHON_VERSION=2.7.10
+    #   env:
-        - PYENV_ROOT=~/.pyenv
+    #     - PYTHON_VERSION=2.7.10
-        - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    #     - PYENV_ROOT=~/.pyenv
+    #     - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
    - os: linux
      dist: trusty
      language: python
@@ -46,7 +47,7 @@ matrix:
        - USE_CONDA=true
 before_install:
-  - if [ "$TRAVIS_OS_NAME" = "linux" -a "$USE_CONDA" = "true" ]; then
+  - if [ "$USE_CONDA" = "true" ]; then
      if [ "$TRAVIS_PYTHON_VERSION" = "2.7" ]; then
        wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
      else