|
@@ -18,20 +18,21 @@ matrix:
|
|
|
- liblapack-dev
|
|
|
- pyqt4-dev-tools
|
|
|
- python-qt4
|
|
|
- - os: osx
|
|
|
- osx_image: xcode8
|
|
|
- language: generic
|
|
|
- env:
|
|
|
- - PYTHON_VERSION=2.7.10
|
|
|
- - PYENV_ROOT=~/.pyenv
|
|
|
- - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
|
|
|
- - os: osx
|
|
|
- osx_image: xcode9
|
|
|
- language: generic
|
|
|
- env:
|
|
|
- - PYTHON_VERSION=2.7.10
|
|
|
- - PYENV_ROOT=~/.pyenv
|
|
|
- - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
|
|
|
+ # FIXME: brew cannot be run on Travis.
|
|
|
+ # - os: osx
|
|
|
+ # osx_image: xcode8
|
|
|
+ # language: generic
|
|
|
+ # env:
|
|
|
+ # - PYTHON_VERSION=2.7.10
|
|
|
+ # - PYENV_ROOT=~/.pyenv
|
|
|
+ # - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
|
|
|
+ # - os: osx
|
|
|
+ # osx_image: xcode9
|
|
|
+ # language: generic
|
|
|
+ # env:
|
|
|
+ # - PYTHON_VERSION=2.7.10
|
|
|
+ # - 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
|