Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change to new cython version #839

Merged
merged 4 commits into from
Jul 26, 2018
Merged

change to new cython version #839

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e9ac83
change to new cython version
wkerzendorf Jul 18, 2018
fe73b52
add cython version check
wkerzendorf Jul 23, 2018
59e625f
remove OSX build for now
wkerzendorf Jul 24, 2018
009f256
add the cython compile example
wkerzendorf Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we leave this in as a comment? This way, we'll know what to do when some strange cython error appears in the future.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That’s why I put it in

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking of keeping the procedure of getting bleeding-edge cython via github and compiling it with custom flags as a comment block and providing some additional information.

- 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

Expand Down
2 changes: 1 addition & 1 deletion tardis_env27.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down