diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0603687b891ae824a66ca546d9c98f021e6048e2..3f5541dd9c91248a87d2de130aea4d84a3ca5deb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,13 +12,12 @@ before_script: - ci/install_basics.sh - pip install --upgrade -r ci/requirements.txt - pip3 install --upgrade -r ci/requirements.txt + - ci/install_pyHealpix.sh test_min: stage: test script: - - ci/install_pyHealpix.sh - - ci/install_pyfftw.sh - nosetests - nosetests3 - nosetests -x --with-coverage --cover-package=nifty --cover-branches diff --git a/ci/install_pyfftw.sh b/ci/install_pyfftw.sh deleted file mode 100644 index ab43961e948ed306e939361255ce01c1fc241ed3..0000000000000000000000000000000000000000 --- a/ci/install_pyfftw.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -apt-get install -y libatlas-base-dev libfftw3-bin libfftw3-dev libfftw3-double3 libfftw3-long3 libfftw3-mpi-dev libfftw3-mpi3 libfftw3-quad3 libfftw3-single3 - -git clone -b mpi https://github.com/fredros/pyFFTW.git -(cd pyFFTW && CC=mpicc python setup.py build_ext install) -(cd pyFFTW && CC=mpicc python3 setup.py build_ext install) -rm -rf pyFFTW diff --git a/ci/requirements.txt b/ci/requirements.txt index cafc6f2d49e912aeb876bb203f97ccf69493fbe1..c51368ea508301beb786727b742459a9bbbde5c1 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -6,3 +6,4 @@ parameterized coverage git+https://gitlab.mpcdf.mpg.de/ift/mpi_dummy.git git+https://gitlab.mpcdf.mpg.de/ift/keepers.git +pyfftw