Cleanups

Dockerfile

@@ -7,23 +7,22 @@ RUN apt-get install -y git
 
 # Packages needed for NIFTy
 RUN apt-get install -y libfftw3-dev
-RUN apt-get install -y python python-dev python-future python-scipy
-RUN apt-get install -y python3 python3-dev python3-future python3-scipy
+RUN apt-get install -y python python-pip python-dev python-future python-scipy
+RUN apt-get install -y python3 python3-pip python3-dev python3-future python3-scipy
+RUN pip install pyfftw
+RUN pip3 install pyfftw
 
-# MPI requirements (optional NIFTy dependencies)
+# Optional NIFTy dependencies
 RUN apt-get install -y openmpi-bin libopenmpi-dev python-mpi4py python3-mpi4py
+RUN pip install git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
+RUN pip3 install git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
 
 # Documentation build dependencies
 RUN apt-get install -y python-sphinx python-sphinx-rtd-theme python-numpydoc
 
 # Testing dependencies
-RUN apt-get install -y python-nose 
-RUN apt-get install -y python3-nose 
-
-# Python module installations
-RUN apt-get install -y python-pip python3-pip
-RUN pip install pyfftw coverage git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
-RUN pip3 install pyfftw git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
+RUN apt-get install -y python-nose python-parameterized
+RUN apt-get install -y python3-nose python3-parameterized
 
 # Create user (openmpi does not like to be run as root)
 RUN useradd -ms /bin/bash testinguser