summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-22 16:41:34 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-22 16:41:34 +0100
commita527cc9e29cae256bd095b032f34c80957e84907 (patch)
treee68dd547d6a88c188eca4798423adf084ba58124 /.travis.yml
parent6a7b605102f1c22224b516906cb4a848cda50a3b (diff)
parentbd2798bed2fddfe00dac006013a9fb1363417f20 (diff)
downloadastra-a527cc9e29cae256bd095b032f34c80957e84907.tar.gz
astra-a527cc9e29cae256bd095b032f34c80957e84907.tar.bz2
astra-a527cc9e29cae256bd095b032f34c80957e84907.tar.xz
astra-a527cc9e29cae256bd095b032f34c80957e84907.zip
Merge branch 'master' into parallel_vec
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 1cd7420..aca9940 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,6 +60,8 @@ before_install:
install:
- conda install python=$TRAVIS_PYTHON_VERSION six numpy scipy cython
- conda info -a
+
+script:
- cd build/linux
- ./autogen.sh
- if [ x$CLANG == xyes ]; then export CXX=clang++; export CC=clang; fi
@@ -67,6 +69,4 @@ install:
- make -j 4
- make test
- make install
-
-script:
- - python -c "import astra"
+ - python -c "import astra; astra.test_noCUDA()"