Skip to content

Commit 7c25f3e

Browse files
author
Shoshana Berleant
committed
more installation instructions; fix link to nose
1 parent a95c5de commit 7c25f3e

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

doc/links_names.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
.. _doctest-mode: http://www.cis.upenn.edu/~edloper/projects/doctestmode/
5757
.. _bazaar: http://bazaar-vcs.org/
5858
.. _subversion: http://subversion.tigris.org/
59-
.. _nose: http://somethingaboutorange.com/mrl/projects/nose
59+
.. _nose: http://nose.readthedocs.io/en/latest/
6060
.. _`python coverage tester`: http://nedbatchelder.com/code/modules/coverage.html
6161

6262
.. Other python projects

doc/users/install.rst

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ If you downloaded the source distribution named something
6262
like ``nipype-x.y.tar.gz``, then unpack the tarball, change into the
6363
``nipype-x.y`` directory and install nipype using::
6464

65+
easy_install nibabel
66+
pip install -r requirements.txt
6567
python setup.py install
6668

6769
**Note:** Depending on permissions you may need to use ``sudo``.
@@ -111,10 +113,15 @@ recommendations.
111113
Must Have
112114
~~~~~~~~~
113115

114-
Python_ 2.7
115-
116116
Nibabel_ 1.0 - 1.4
117-
Neuroimaging file i/o library
117+
Neuroimaging file i/o library.
118+
119+
.. note::
120+
121+
Full distributions of Nipype, such as the ones in Anaconda_ or Canopy_, provide
122+
the following packages automatically.
123+
124+
Python_ 2.7
118125

119126
NetworkX_ 1.0 - 1.8
120127
Python package for working with complex networks.
@@ -128,10 +135,6 @@ Enthought_ Traits_ 4.0.0 - 4.3.0
128135

129136
Dateutil 1.5 -
130137

131-
.. note::
132-
133-
Full distributions such as Anaconda_ or Canopy_ provide the above packages,
134-
except Nibabel_.
135138

136139
Strong Recommendations
137140
~~~~~~~~~~~~~~~~~~~~~~
@@ -144,18 +147,22 @@ Matplotlib_ 1.0 - 1.2
144147
Plotting library
145148

146149
`RDFLib <http://rdflib.readthedocs.org/en/latest/>`_ 4.1
147-
RDFLibrary required for provenance export as RDF
150+
RDFLibrary required for provenance export as RDF
148151

149152
Sphinx_ 1.1
150153
Required for building the documentation
151154

152155
`Graphviz <http://www.graphviz.org/>`_
153-
Required for building the documentation
156+
Required for building the documentation. The python wrapper package (``graphviz``)
157+
and the program itself both need to be installed.
154158

155159
Interface Dependencies
156160
~~~~~~~~~~~~~~~~~~~~~~
157161

158-
These are the software packages that nipype.interfaces wraps:
162+
You might not need some of the following packages, depending on what exactly you
163+
want to use nipype for. If you do need any of them, install nipype's wrapper package
164+
(``nipype.interfaces``), then install the programs separately onto your computer, just
165+
like you would install any other app.
159166

160167
FSL_
161168
4.1.0 or later

0 commit comments

Comments
 (0)