diff --git a/.travis.yml b/.travis.yml index 93ccfdc2537..d1b76a85608 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,13 +40,14 @@ matrix: - TEST_MODE='spectrum' #trouble with osx building due to segfault at cython (https://github.com/cython/cython/issues/2199) - - os: osx - language: generic - env: - - COMPILER=clang - - SETUP_CMD='test --args="--tardis-refdata=$HOME/tardis-refdata/"' - - TEST_MODE='spectrum' - - MINICONDA_URL='http://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh' +# and https://github.com/cython/cython/issues/2505 +# - os: osx +# language: generic +# env: +# - COMPILER=clang +# - SETUP_CMD='test --args="--tardis-refdata=$HOME/tardis-refdata/"' +# - TEST_MODE='spectrum' +# - MINICONDA_URL='http://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh' - python: 2.7 @@ -87,15 +88,9 @@ install: - cd $TRAVIS_BUILD_DIR - conda env create -f tardis_env27.yml - source activate tardis - #trouble with building due to segfault at cython (https://github.com/cython/cython/issues/2199) - #remove if we can get normal cython through conda - - git clone https://github.com/cython/cython - - cd cython - - git checkout c485b1b77264c3c75d090a3c526de24966830d42 - - CFLAGS="$CFLAGS -D CYTHON_CLINE_IN_TRACEBACK=0" python setup.py install - - cd .. script: + - python -c "import Cython; print Cython.__version__" - echo CC=$COMPILER python setup.py $SETUP_CMD - CC=$COMPILER python setup.py $SETUP_CMD diff --git a/tardis_env27.yml b/tardis_env27.yml index 57c16774223..e25ff7ef4c9 100644 --- a/tardis_env27.yml +++ b/tardis_env27.yml @@ -15,7 +15,7 @@ dependencies: - matplotlib=2.0 - astropy=1.3 - numexpr=2.6 -#- Cython=0.28 +- Cython=0.28.4 - networkx=1.10 - pytest=3.0 - pyyaml=3.12