Commit 8189bc41 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

cleanups

parent fdac5666
...@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \ ...@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \
# Documentation build dependencies # Documentation build dependencies
python-sphinx python-sphinx-rtd-theme python-numpydoc \ python-sphinx python-sphinx-rtd-theme python-numpydoc \
# Testing dependencies # Testing dependencies
python3-nose python3-coverage python3-parameterized python3-pytest python3-pytest-cov \ python3-coverage python3-parameterized python3-pytest python3-pytest-cov \
# Optional NIFTy dependencies # Optional NIFTy dependencies
openmpi-bin libopenmpi-dev python3-mpi4py \ openmpi-bin libopenmpi-dev python3-mpi4py \
# Packages needed for NIFTy # Packages needed for NIFTy
......
...@@ -37,7 +37,7 @@ Installation ...@@ -37,7 +37,7 @@ Installation
### Requirements ### Requirements
- [Python](https://www.python.org/) (v2.7.x or 3.5.x) - [Python 3](https://www.python.org/) (3.5.x or later)
- [SciPy](https://www.scipy.org/) - [SciPy](https://www.scipy.org/)
- [pyFFTW](https://pypi.python.org/pypi/pyFFTW) - [pyFFTW](https://pypi.python.org/pypi/pyFFTW)
...@@ -61,8 +61,8 @@ distributions, the "apt" lines will need slight changes. ...@@ -61,8 +61,8 @@ distributions, the "apt" lines will need slight changes.
NIFTy5 and its mandatory dependencies can be installed via: NIFTy5 and its mandatory dependencies can be installed via:
sudo apt-get install git libfftw3-dev python python-pip python-dev sudo apt-get install git libfftw3-dev python3 python3-pip python3-dev
pip install --user git+https://gitlab.mpcdf.mpg.de/ift/NIFTy.git@NIFTy_5 pip3 install --user git+https://gitlab.mpcdf.mpg.de/ift/NIFTy.git@NIFTy_5
(Note: If you encounter problems related to `pyFFTW`, make sure that you are (Note: If you encounter problems related to `pyFFTW`, make sure that you are
using a pip-installed `pyFFTW` package. Unfortunately, some distributions are using a pip-installed `pyFFTW` package. Unfortunately, some distributions are
...@@ -71,35 +71,26 @@ with the installed `FFTW3` libraries.) ...@@ -71,35 +71,26 @@ with the installed `FFTW3` libraries.)
Plotting support is added via: Plotting support is added via:
pip install --user matplotlib pip3 install --user matplotlib
Support for spherical harmonic transforms is added via: Support for spherical harmonic transforms is added via:
pip install --user git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git pip3 install --user git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
MPI support is added via: MPI support is added via:
sudo apt-get install openmpi-bin libopenmpi-dev sudo apt-get install openmpi-bin libopenmpi-dev
pip install --user mpi4py pip3 install --user mpi4py
### Installation for Python 3
If you want to run NIFTy with Python 3, you need to make the following changes
to the instructions above:
- in all `apt-get` commands, replace `python-*` by `python3-*`
- in all `pip` commands, replace `pip` by `pip3`
### Running the tests ### Running the tests
In oder to run the tests one needs two additional packages: In oder to run the tests one needs two additional packages:
sudo apt-get install python3-coverage python3-parameterized python3-pytest python3-pytest-cov
pip install --user nose parameterized coverage
Afterwards the tests (including a coverage report) can be run using the Afterwards the tests (including a coverage report) can be run using the
following command in the repository root: following command in the repository root:
nosetests -x --with-coverage --cover-html --cover-package=nifty5 pytest-3 --cov=nifty5 test
### First Steps ### First Steps
...@@ -108,7 +99,7 @@ For a quick start, you can browse through the [informal ...@@ -108,7 +99,7 @@ For a quick start, you can browse through the [informal
introduction](http://ift.pages.mpcdf.de/NIFTy/code.html) or introduction](http://ift.pages.mpcdf.de/NIFTy/code.html) or
dive into NIFTy by running one of the demonstrations, e.g.: dive into NIFTy by running one of the demonstrations, e.g.:
python demos/getting_started_1.py python3 demos/getting_started_1.py
### Acknowledgement ### Acknowledgement
......
...@@ -7,8 +7,8 @@ distributions, the "apt" lines will need slight changes. ...@@ -7,8 +7,8 @@ distributions, the "apt" lines will need slight changes.
NIFTy5 and its mandatory dependencies can be installed via:: NIFTy5 and its mandatory dependencies can be installed via::
sudo apt-get install git libfftw3-dev python python-pip python-dev sudo apt-get install git libfftw3-dev python3 python3-pip python3-dev
pip install --user git+https://gitlab.mpcdf.mpg.de/ift/NIFTy.git@NIFTy_4 pip3 install --user git+https://gitlab.mpcdf.mpg.de/ift/NIFTy.git@NIFTy_5
(Note: If you encounter problems related to `pyFFTW`, make sure that you are (Note: If you encounter problems related to `pyFFTW`, make sure that you are
using a pip-installed `pyFFTW` package. Unfortunately, some distributions are using a pip-installed `pyFFTW` package. Unfortunately, some distributions are
...@@ -17,22 +17,13 @@ with the installed `FFTW3` libraries.) ...@@ -17,22 +17,13 @@ with the installed `FFTW3` libraries.)
Plotting support is added via:: Plotting support is added via::
pip install --user matplotlib pip3 install --user matplotlib
Support for spherical harmonic transforms is added via:: Support for spherical harmonic transforms is added via::
pip install --user git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git pip3 install --user git+https://gitlab.mpcdf.mpg.de/ift/pyHealpix.git
MPI support is added via:: MPI support is added via::
sudo apt-get install openmpi-bin libopenmpi-dev sudo apt-get install openmpi-bin libopenmpi-dev
pip install --user mpi4py pip3 install --user mpi4py
Installation for Python 3
-------------------------
If you want to run NIFTy with Python 3, you need to make the following changes
to the instructions above:
- in all `apt-get` commands, replace `python-*` by `python3-*`
- in all `pip` commands, replace `pip` by `pip3`
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment