Revert "tweak CI"

This reverts commit 7c42148f.

.gitlab-ci.yml

@@ -15,39 +15,11 @@ before_script:
 
 
 test_min:
-  stage: test
-  script:
-    - nosetests -vv
-    - nosetests3 -vv
-
-test_mpi:
-  stage: test
-  script:
-    - ci/install_pyHealpix.sh
-    - ci/install_mpi4py.sh
-    - nosetests -vv
-    - nosetests3 -vv
-
-test_mpi_fftw:
-  stage: test
-  script:
-    - ci/install_pyHealpix.sh
-    - ci/install_mpi4py.sh
-    - ci/install_pyfftw.sh
-    - nosetests -vv
-    - nosetests3 -vv
-
-test_mpi_fftw_hdf5:
   stage: test
   script:
     - ci/install_pyHealpix.sh
-    - ci/install_mpi4py.sh
-    - ci/install_pyfftw.sh
-    - ci/install_h5py.sh
-    - mpiexec --allow-run-as-root -n 2 nosetests -x
-    - mpiexec --allow-run-as-root -n 2 nosetests3 -x
-    - mpiexec --allow-run-as-root -n 4 nosetests -x
-    - mpiexec --allow-run-as-root -n 4 nosetests3 -x
+    - nosetests
+    - nosetests3
     - nosetests -x --with-coverage --cover-package=nifty --cover-branches
     - >
       coverage report | grep TOTAL | awk '{ print "TOTAL: "$6; }'

ci/install_basics.sh

 #!/bin/bash
 
-apt-get install -y build-essential python python-pip python-dev git autoconf libtool gsl-bin libgsl-dev wget python3 python3-pip python3-dev python3-nose
+apt-get install -y build-essential python python-pip python-dev git autoconf libtool gsl-bin libgsl-dev wget python3 python3-pip python3-dev python3-nose libatlas-base-dev libfftw3-bin libfftw3-dev libfftw3-double3 libfftw3-long3 libfftw3-mpi-dev libfftw3-mpi3 libfftw3-quad3 libfftw3-single3 python-numpy python3-numpy

ci/install_h5py.sh

-#!/bin/bash
-
-apt-get install -y libhdf5-10 libhdf5-dev libhdf5-openmpi-10 libhdf5-openmpi-dev hdf5-tools
-CC=mpicc HDF5_DIR=/usr/lib/x86_64-linux-gnu/hdf5/openmpi HDF5_MPI="ON" pip install --no-binary=h5py h5py

ci/install_mpi4py.sh

-#!/bin/bash
-
-apt-get install -y openmpi-bin libopenmpi-dev
-pip install mpi4py
-pip3 install mpi4py

ci/install_pyHealpix.sh

@@ -2,5 +2,7 @@
 
 git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
 (cd pyHealpix && autoreconf -i && ./configure --enable-openmp && make -j4 install)
-(cd pyHealpix && autoreconf -i && PYTHON=python3 ./configure --enable-openmp && make -j4 install)
+rm -rf pyHealpix
+git clone https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
+(cd pyHealpix && autoreconf -i && PYTHON=python3 PYTHON_CONFIG=python3-config ./configure --enable-openmp && make -j4 install)
 rm -rf pyHealpix

ci/install_pyfftw.sh

-#!/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

ci/requirements.txt

-numpy
-cython
 matplotlib
 plotly
 nose
 parameterized
 coverage
-git+https://gitlab.mpcdf.mpg.de/ift/mpi_dummy.git
-git+https://gitlab.mpcdf.mpg.de/ift/keepers.git
-git+https://gitlab.mpcdf.mpg.de/ift/D2O.git
+pyfftw
+future

ci/requirements_extras.txt

-ipython==5.3.0