From 0e9ac83e0db8d2499afe2c7ab69320241f9a07c5 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Wed, 18 Jul 2018 18:45:45 +0200
Subject: [PATCH 1/4] change to new cython version

---
 .travis.yml      | 7 -------
 tardis_env27.yml | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 93ccfdc2537..2abe9f1558f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,13 +87,6 @@ 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:
     - echo CC=$COMPILER python setup.py $SETUP_CMD
diff --git a/tardis_env27.yml b/tardis_env27.yml
index 000d7cda80b..5716d3fcec2 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

From fe73b520449d2d0122dd4fedf91f2b68ab04571c Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Mon, 23 Jul 2018 17:46:40 +0200
Subject: [PATCH 2/4] add cython version check

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 2abe9f1558f..3c64bb2e8ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,6 +89,7 @@ install:
    - source activate tardis
 
 script:
+    - python -c "import Cython; print Cython.__version__"
     - echo CC=$COMPILER python setup.py $SETUP_CMD
     - CC=$COMPILER python setup.py $SETUP_CMD
 

From 59e625f8dffc42881838564f3ae04e03c07611bf Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Tue, 24 Jul 2018 11:42:53 +0200
Subject: [PATCH 3/4] remove OSX build for now

---
 .travis.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3c64bb2e8ef..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

From 009f25640448c8e42348667a433432aa4a5ae95e Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Thu, 26 Jul 2018 11:55:32 +0200
Subject: [PATCH 4/4] add the cython compile example

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d1b76a85608..a9c5937a519 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,13 @@ matrix:
 #            - 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'
+# The OSX version does work if one builds cython on its own with a special CFLAGS
 
+#   - 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 ..
 
         - python: 2.7
           env: SETUP_CMD='test'