Skip to content

Commit 3f058e4

Browse files
committed
DOC: update installation instructions
Installation instructions were horribly out of date.
1 parent b3fbda9 commit 3f058e4

File tree

4 files changed

+192
-167
lines changed

4 files changed

+192
-167
lines changed

README.rst

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,36 +92,25 @@ directory of the nipy distribution::
9292
is part of the nose package. Try ``nipnost --help`` to see a large number of
9393
command-line options.
9494

95-
Dependencies
95+
Installation
9696
============
9797

98-
To run NIPY, you will need:
98+
See the latest `installation instructions`_.
9999

100-
* python_ >= 2.6 (tested with 2.6, 2.7, 3.2 through 3.5)
101-
* numpy_ >= 1.6.0
102-
* scipy_ >= 0.9.0
103-
* sympy_ >= 0.7.0
104-
* nibabel_ >= 1.2
105-
106-
You will probably also like to have:
100+
License
101+
=======
107102

108-
* ipython_ for interactive work
109-
* matplotlib_ for 2D plotting
110-
* mayavi_ for 3D plotting
103+
We use the 3-clause BSD license; the full license is in the file ``LICENSE`` in
104+
the nipy distribution.
111105

106+
.. links:
112107
.. _python: http://python.org
113108
.. _numpy: http://numpy.scipy.org
114109
.. _scipy: http://www.scipy.org
115110
.. _sympy: http://sympy.org
116111
.. _nibabel: http://nipy.org/nibabel
117112
.. _ipython: http://ipython.org
118113
.. _matplotlib: http://matplotlib.org
119-
.. _mayavi: http://code.enthought.com/projects/mayavi/
120114
.. _nose: http://nose.readthedocs.org/en/latest
121115
.. _mock: https://pypi.python.org/pypi/mock
122-
123-
License
124-
=======
125-
126-
We use the 3-clause BSD license; the full license is in the file ``LICENSE``
127-
in the nipy distribution.
116+
.. _installation instructions: http://nipy.org/nipy/users/installation.html

doc/links_names.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,15 @@
7070
.. _pypi: http://pypi.python.org
7171
.. _example pypi: http://packages.python.org/an_example_pypi_project/setuptools.html#intermezzo-pypirc-file-and-gpg
7272
.. _github bdist_mpkg: https://github.com/matthew-brett/bdist_mpkg
73+
.. _wheel: https://pypi.python.org/pypi/wheel
74+
.. _install pip with get-pip.py: https://pip.pypa.io/en/stable/installing/#installing-with-get-pip-py
7375

7476
.. Code support stuff
7577
.. _pychecker: http://pychecker.sourceforge.net/
7678
.. _pylint: http://www.logilab.org/project/pylint
7779
.. _pyflakes: http://divmod.org/trac/wiki/DivmodPyflakes
7880
.. _virtualenv: http://pypi.python.org/pypi/virtualenv
79-
.. _git: http://git.or.cz/
81+
.. _git: https://git-scm.com
8082
.. _flymake: http://flymake.sourceforge.net/
8183
.. _rope: http://rope.sourceforge.net/
8284
.. _pymacs: http://pymacs.progiciels-bpi.ca/pymacs.html
@@ -107,7 +109,7 @@
107109
.. _python (x, y): https://python-xy.github.io/
108110
.. _EPD: http://www.enthought.com/products/epd.php
109111
.. _EPD free: http://www.enthought.com/products/epd_free.php
110-
.. _Anaconda CE: https://store.continuum.io/
112+
.. _Anaconda: https://www.continuum.io/downloads
111113
.. _Unofficial Windows binaries: http://www.lfd.uci.edu/~gohlke/pythonlibs
112114

113115
.. Python imaging projects

0 commit comments

Comments
 (0)