From edd55d749fae7aaba2467baa561242d624e4c78c Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Fri, 1 Sep 2017 13:09:52 +0200
Subject: [PATCH] Revert "tweak CI"
This reverts commit 7c42148f5394d433ac9b898e9dac4c4ebc4ee8b5.
---
.gitlab-ci.yml | 32 ++------------------------------
ci/install_basics.sh | 2 +-
ci/install_h5py.sh | 4 ----
ci/install_mpi4py.sh | 5 -----
ci/install_pyHealpix.sh | 4 +++-
ci/install_pyfftw.sh | 8 --------
ci/requirements.txt | 7 ++-----
ci/requirements_extras.txt | 1 -
8 files changed, 8 insertions(+), 55 deletions(-)
delete mode 100644 ci/install_h5py.sh
delete mode 100644 ci/install_mpi4py.sh
delete mode 100644 ci/install_pyfftw.sh
delete mode 100644 ci/requirements_extras.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21ac1bd3b..5739e9805 100644
--- a/.gitlab-ci.yml
+++ b/.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; }'
diff --git a/ci/install_basics.sh b/ci/install_basics.sh
index af2a2c23d..1bc14dbac 100644
--- a/ci/install_basics.sh
+++ b/ci/install_basics.sh
@@ -1,3 +1,3 @@
#!/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
diff --git a/ci/install_h5py.sh b/ci/install_h5py.sh
deleted file mode 100644
index 6702ca879..000000000
--- a/ci/install_h5py.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/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
diff --git a/ci/install_mpi4py.sh b/ci/install_mpi4py.sh
deleted file mode 100644
index 41a650d0e..000000000
--- a/ci/install_mpi4py.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-apt-get install -y openmpi-bin libopenmpi-dev
-pip install mpi4py
-pip3 install mpi4py
diff --git a/ci/install_pyHealpix.sh b/ci/install_pyHealpix.sh
index 1e4fccc0a..0c66b40db 100644
--- a/ci/install_pyHealpix.sh
+++ b/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
diff --git a/ci/install_pyfftw.sh b/ci/install_pyfftw.sh
deleted file mode 100644
index ab43961e9..000000000
--- 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 c24a1265b..1734a57b3 100644
--- a/ci/requirements.txt
+++ b/ci/requirements.txt
@@ -1,10 +1,7 @@
-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
diff --git a/ci/requirements_extras.txt b/ci/requirements_extras.txt
deleted file mode 100644
index f0e407a78..000000000
--- a/ci/requirements_extras.txt
+++ /dev/null
@@ -1 +0,0 @@
-ipython==5.3.0
--
GitLab