Skip to content

Commit 22f6da0

Browse files
committed
Updated installation docs
1 parent 9bb45a3 commit 22f6da0

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

docs/user/_sources/install.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ Please ensure that you are using Python 2.7 and above, but not Python 3 (since i
107107
* `iPython <http://ipython.org/>`_ (optional)
108108
* `PyGraphviz <http://www.graphviz.org/>`_ (optional; required for workflow graphs)
109109
* `Patsy <https://patsy.readthedocs.org/en/latest/>`_
110+
* `Boto 3 <https://boto3.readthedocs.org/en/latest/>`_
111+
* `psutil <https://github.com/giampaolo/psutil>`_
110112

111113
Miniconda
112114
""""""""
@@ -123,7 +125,7 @@ The following commands will install all the Python dependencies within a Minicon
123125
conda create -y -n cpac python
124126
source activate cpac
125127
conda install -y cython numpy scipy matplotlib networkx traits pyyaml jinja2 nose ipython pip wxpython
126-
pip install lockfile pygraphviz nibabel nipype patsy
128+
pip install lockfile pygraphviz nibabel nipype patsy psutil boto3
127129
source deactivate
128130

129131
OS-Specific Instructions
@@ -177,7 +179,8 @@ OS-Specific Instructions
177179
apt-get update
178180

179181
* FSL : ``apt-get install -y fsl-5.0-complete``
180-
* AFNI : ``apt-get install -y afni``
182+
183+
We have encountered compatibility issues in the past with the Neurodebian binary for AFNI. For this reason, it is suggested that you follow the official installation instructions from the AFNI homepage (see above).
181184

182185
**Mac OS X:**
183186

docs/user/install.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>Installing C-PAC &mdash; C-PAC 0.3.9 Alpha documentation</title>
9+
<title>Installing C-PAC &mdash; C-PAC 0.4.0 Alpha documentation</title>
1010

1111
<link rel="stylesheet" href="_static/nature.css" type="text/css" />
1212
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: './',
17-
VERSION: '0.3.9 Alpha',
17+
VERSION: '0.4.0 Alpha',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="_static/underscore.js"></script>
2525
<script type="text/javascript" src="_static/doctools.js"></script>
2626
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
27-
<link rel="top" title="C-PAC 0.3.9 Alpha documentation" href="index.html" />
27+
<link rel="top" title="C-PAC 0.4.0 Alpha documentation" href="index.html" />
2828
<link rel="next" title="Using C-PAC" href="use.html" />
2929
<link rel="prev" title="Welcome to C-PAC’s Documentation!" href="index.html" />
3030
</head>
@@ -41,7 +41,7 @@ <h3>Navigation</h3>
4141
<li class="right" >
4242
<a href="index.html" title="Welcome to C-PAC’s Documentation!"
4343
accesskey="P">previous</a> |</li>
44-
<li><a href="index.html">C-PAC 0.3.9 Alpha documentation</a> &raquo;</li>
44+
<li><a href="index.html">C-PAC 0.4.0 Alpha documentation</a> &raquo;</li>
4545
</ul>
4646
</div>
4747

@@ -156,6 +156,8 @@ <h2>Installing Python Dependencies<a class="headerlink" href="#installing-python
156156
<li><a class="reference external" href="http://ipython.org/">iPython</a> (optional)</li>
157157
<li><a class="reference external" href="http://www.graphviz.org/">PyGraphviz</a> (optional; required for workflow graphs)</li>
158158
<li><a class="reference external" href="https://patsy.readthedocs.org/en/latest/">Patsy</a></li>
159+
<li><a class="reference external" href="https://boto3.readthedocs.org/en/latest/">Boto 3</a></li>
160+
<li><a class="reference external" href="https://github.com/giampaolo/psutil">psutil</a></li>
159161
</ul>
160162
<div class="section" id="id1">
161163
<h3>Miniconda<a class="headerlink" href="#id1" title="Permalink to this headline"></a></h3>
@@ -168,7 +170,7 @@ <h3>Miniconda<a class="headerlink" href="#id1" title="Permalink to this headline
168170
conda create -y -n cpac python
169171
<span class="nb">source </span>activate cpac
170172
conda install -y cython numpy scipy matplotlib networkx traits pyyaml jinja2 nose ipython pip wxpython
171-
pip install lockfile pygraphviz nibabel nipype patsy
173+
pip install lockfile pygraphviz nibabel nipype patsy psutil boto3
172174
<span class="nb">source </span>deactivate
173175
</pre></div>
174176
</div>
@@ -217,9 +219,8 @@ <h3>OS-Specific Instructions<a class="headerlink" href="#id6" title="Permalink t
217219
</li>
218220
<li><p class="first">FSL : <tt class="docutils literal"><span class="pre">apt-get</span> <span class="pre">install</span> <span class="pre">-y</span> <span class="pre">fsl-5.0-complete</span></tt></p>
219221
</li>
220-
<li><p class="first">AFNI : <tt class="docutils literal"><span class="pre">apt-get</span> <span class="pre">install</span> <span class="pre">-y</span> <span class="pre">afni</span></tt></p>
221-
</li>
222222
</ul>
223+
<p>We have encountered compatibility issues in the past with the Neurodebian binary for AFNI. For this reason, it is suggested that you follow the official installation instructions from the AFNI homepage (see above).</p>
223224
<p><strong>Mac OS X:</strong></p>
224225
<ul class="simple">
225226
<li>FSL - Follow the instructions on the <a class="reference external" href="http://fsl.fmrib.ox.ac.uk/fsldownloads/fsldownloadmain.html">FSL Download Page</a>.</li>
@@ -407,7 +408,7 @@ <h3>Navigation</h3>
407408
<li class="right" >
408409
<a href="index.html" title="Welcome to C-PAC’s Documentation!"
409410
>previous</a> |</li>
410-
<li><a href="index.html">C-PAC 0.3.9 Alpha documentation</a> &raquo;</li>
411+
<li><a href="index.html">C-PAC 0.4.0 Alpha documentation</a> &raquo;</li>
411412
</ul>
412413
</div>
413414
<div class="footer">

0 commit comments

Comments
 (0)