Commit 18f18880 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

document SciPy dependency, remove numpy dependency (since it is implied by SciPy)

parent 1848b8b6
Pipeline #28140 canceled with stage
in 38 minutes and 49 seconds
...@@ -3,8 +3,8 @@ FROM debian:testing-slim ...@@ -3,8 +3,8 @@ FROM debian:testing-slim
RUN apt-get update RUN apt-get update
# Debian package installations # Debian package installations
RUN apt-get install -y git libfftw3-dev openmpi-bin libopenmpi-dev python python-pip python-dev python-nose python-numpy python-matplotlib python-future python-mpi4py python-scipy RUN apt-get install -y git libfftw3-dev openmpi-bin libopenmpi-dev python python-pip python-dev python-nose python-matplotlib python-future python-mpi4py python-scipy
RUN apt-get install -y python3 python3-pip python3-dev python3-nose python3-numpy python3-matplotlib python3-future python3-mpi4py python3-scipy RUN apt-get install -y python3 python3-pip python3-dev python3-nose python3-matplotlib python3-future python3-mpi4py python3-scipy
RUN apt-get install -y python-sphinx python-sphinx-rtd-theme python-numpydoc RUN apt-get install -y python-sphinx python-sphinx-rtd-theme python-numpydoc
# Python module installations # Python module installations
......
...@@ -38,7 +38,7 @@ Installation ...@@ -38,7 +38,7 @@ Installation
### Requirements ### Requirements
- [Python](https://www.python.org/) (v2.7.x or 3.5.x) - [Python](https://www.python.org/) (v2.7.x or 3.5.x)
- [NumPy](https://www.numpy.org/) - [SciPy](https://www.scipy.org/)
- [pyFFTW](https://pypi.python.org/pypi/pyFFTW) - [pyFFTW](https://pypi.python.org/pypi/pyFFTW)
Optional dependencies: Optional dependencies:
...@@ -46,7 +46,6 @@ Optional dependencies: ...@@ -46,7 +46,6 @@ Optional dependencies:
transforms involving domains on the sphere) transforms involving domains on the sphere)
- [mpi4py](https://mpi4py.scipy.org) (for MPI-parallel execution) - [mpi4py](https://mpi4py.scipy.org) (for MPI-parallel execution)
- [matplotlib](https://matplotlib.org/) (for field plotting) - [matplotlib](https://matplotlib.org/) (for field plotting)
- [SciPy](https://www.scipy.org/) (for additional minimization algorithms)
### Sources ### Sources
...@@ -83,10 +82,6 @@ MPI support is added via: ...@@ -83,10 +82,6 @@ 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 pip install --user mpi4py
Scipy-based minimizers are enabled via:
pip install --user scipy
### Installation for Python 3 ### Installation for Python 3
If you want to run NIFTy with Python 3, you need to make the following changes If you want to run NIFTy with Python 3, you need to make the following changes
......
...@@ -28,10 +28,6 @@ MPI support is added via:: ...@@ -28,10 +28,6 @@ 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 pip install --user mpi4py
Scipy-based minimizers are enabled via::
pip install --user scipy
Installation for Python 3 Installation for Python 3
------------------------- -------------------------
...@@ -40,4 +36,3 @@ to the instructions above: ...@@ -40,4 +36,3 @@ to the instructions above:
- in all `apt-get` commands, replace `python-*` by `python3-*` - in all `apt-get` commands, replace `python-*` by `python3-*`
- in all `pip` commands, replace `pip` by `pip3` - in all `pip` commands, replace `pip` by `pip3`
...@@ -40,8 +40,8 @@ setup(name="nifty4", ...@@ -40,8 +40,8 @@ setup(name="nifty4",
packages=find_packages(include=["nifty4", "nifty4.*"]), packages=find_packages(include=["nifty4", "nifty4.*"]),
zip_safe=True, zip_safe=True,
license="GPLv3", license="GPLv3",
setup_requires=['future', 'numpy'], setup_requires=['future', 'scipy'],
install_requires=['future', 'numpy', 'pyfftw>=0.10.4'], install_requires=['future', 'scipy', 'pyfftw>=0.10.4'],
classifiers=[ classifiers=[
"Development Status :: 4 - Beta", "Development Status :: 4 - Beta",
"Topic :: Utilities", "Topic :: Utilities",
......
Supports Markdown
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