Skip to content

Commit 3a41178

Browse files
committed
Merge pull request #1188 from BRAINSia/CleanTrailingWhiteSpace
STYLE: Remove end of line trailing white space
2 parents 6268f26 + 246c131 commit 3a41178

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+244
-245
lines changed

README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ NIPYPE: Neuroimaging in Python: Pipelines and Interfaces
44

55
.. image:: https://travis-ci.org/nipy/nipype.png?branch=master
66
:target: https://travis-ci.org/nipy/nipype
7-
7+
88
.. image:: https://circleci.com/gh/nipy/nipype/tree/master.svg?style=svg
99
:target: https://circleci.com/gh/nipy/nipype/tree/master
1010

1111
.. image:: https://coveralls.io/repos/nipy/nipype/badge.png
1212
:target: https://coveralls.io/r/nipy/nipype
13-
13+
1414
.. image:: https://www.codacy.com/project/badge/182f27944c51474490b369d0a23e2f32
1515
:target: https://www.codacy.com/app/krzysztof-gorgolewski/nipy_nipype
1616

@@ -70,7 +70,7 @@ Website
7070
-------
7171

7272
Information specific to Nipype is located here::
73-
73+
7474
http://nipy.org/nipype
7575

7676

@@ -81,10 +81,10 @@ If you have a problem or would like to ask a question about how to do something
8181
to `NeuroStars.org <http://neurostars.org>`_ with a *nipype* tag. `NeuroStars.org <http://neurostars.org>`_ is a platform similar to StackOverflow but dedicated to neuroinformatics. All previous Nipype questions are available here::
8282

8383
http://neurostars.org/t/nipype/
84-
84+
8585

8686
To participate in the Nipype development related discussions please use the following mailing list::
87-
87+
8888
http://mail.python.org/mailman/listinfo/neuroimaging
8989

9090
Please add *[nipype]* to the subject line when posting on the mailing list.
@@ -96,7 +96,7 @@ Nipype structure
9696
Currently Nipype consists of the following files and directories:
9797

9898
INSTALL
99-
NIPYPE prerequisites, installation, development, testing, and
99+
NIPYPE prerequisites, installation, development, testing, and
100100
troubleshooting.
101101

102102
README

THANKS.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ Other contributors
8686
* Mike Trumpis
8787
* Karl Young
8888
* Tom Waite
89-
89+
9090
We would also like to thank `JetBrains <http://www.jetbrains.com/>`__ for providing `Pycharm <http://www.jetbrains.com/pycharm/>`__ licenses.
91-
91+
9292
Funding
9393
-------
9494
Satrajit Ghosh work on this project was partially funded by NIBIB R03 EB008673 (PI: Ghosh and Whitfield-Gabrieli) and by the `INCF <http://www.incf.org>`__ through a contract with TankThink Labs, LLC.
95-
Chris Burns was supported by NIMH grant 5R01MH081909-02 (PI: Desposito). Hans Jonson was supported by
96-
`2 U54 EB005149 - 06 Core 2b Huntington's Disease - Driving Biological Project <http://projectreporter.nih.gov/project_info_description.cfm?aid=8153616&icde=16158743&ddparam=&ddvalue=&ddsub=&cr=18&csb=PT&cs=ASC>`__,
97-
`S10 RR023392 Enterprise Storage In A Collaborative Neuroimaging Environment <http://projectreporter.nih.gov/project_info_description.cfm?aid=7209718&icde=16158552&ddparam=&ddvalue=&ddsub=&cr=1&csb=default&cs=ASC>`__,
98-
`R01 NS040068 Neurobiological Predictors of Huntington's Disease <http://projectreporter.nih.gov/project_info_description.cfm?aid=6266377&icde=16158103>`__,
95+
Chris Burns was supported by NIMH grant 5R01MH081909-02 (PI: Desposito). Hans Jonson was supported by
96+
`2 U54 EB005149 - 06 Core 2b Huntington's Disease - Driving Biological Project <http://projectreporter.nih.gov/project_info_description.cfm?aid=8153616&icde=16158743&ddparam=&ddvalue=&ddsub=&cr=18&csb=PT&cs=ASC>`__,
97+
`S10 RR023392 Enterprise Storage In A Collaborative Neuroimaging Environment <http://projectreporter.nih.gov/project_info_description.cfm?aid=7209718&icde=16158552&ddparam=&ddvalue=&ddsub=&cr=1&csb=default&cs=ASC>`__,
98+
`R01 NS040068 Neurobiological Predictors of Huntington's Disease <http://projectreporter.nih.gov/project_info_description.cfm?aid=6266377&icde=16158103>`__,
9999
and `UL1 TR000442 University of Iowa Clinical and Translational Science Program <http://projectreporter.nih.gov/project_info_description.cfm?aid=8467220&icde=16159156&ddparam=&ddvalue=&ddsub=&cr=1&csb=default&cs=ASC>`__.
100100

doc/devel/gitwash/configure_git.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Here is an example ``.gitconfig`` file::
1616
[user]
1717
name = Your Name
1818
email = you@yourdomain.example.com
19-
19+
2020
[alias]
2121
ci = commit -a
2222
co = checkout
2323
st = status -a
2424
stat = status -a
2525
br = branch
2626
wdiff = diff --color-words
27-
27+
2828
[core]
2929
editor = vim
3030

@@ -33,7 +33,7 @@ Here is an example ``.gitconfig`` file::
3333

3434
You can edit this file directly or you can use the ``git config --global``
3535
command::
36-
36+
3737
git config --global user.name "Your Name"
3838
git config --global user.email you@yourdomain.example.com
3939
git config --global alias.ci "commit -a"

doc/devel/gitwash/development_workflow.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Workflow summary
2222
This way of working really helps to keep work well organized, and in
2323
keeping history as clear as possible.
2424

25-
See |emdash| for example |emdash| `linux git workflow`_.
25+
See |emdash| for example |emdash| `linux git workflow`_.
2626

2727
Making a new feature branch
2828
===========================
@@ -44,7 +44,7 @@ In git >1.7 you can ensure that the link is correctly set by using the
4444
``--set-upstream`` option::
4545

4646
git push --set-upstream origin my-new-feature
47-
47+
4848
From now on git_ will know that ``my-new-feature`` is related to the
4949
``my-new-feature`` branch in the github_ repo.
5050

@@ -83,7 +83,7 @@ In more detail
8383

8484
#. Check what the actual changes are with ``git diff`` (`git diff`_).
8585
#. Add any new files to version control ``git add new_file_name`` (see
86-
`git add`_).
86+
`git add`_).
8787
#. To commit all modified files into the local copy of your repo,, do
8888
``git commit -am 'A commit message'``. Note the ``-am`` options to
8989
``commit``. The ``m`` flag just signals that you're going to type a
@@ -92,7 +92,7 @@ In more detail
9292
description in the `tangled working copy problem`_. The `git commit`_ manual
9393
page might also be useful.
9494
#. To push the changes up to your forked repo on github_, do a ``git
95-
push`` (see `git push`).
95+
push`` (see `git push`).
9696

9797
Asking for code review
9898
======================
@@ -121,7 +121,7 @@ Asking for code review
121121
The generated comparison, is between your feature branch
122122
``my-new-feature``, and the place in ``master`` from which you branched
123123
``my-new-feature``. In other words, you can keep updating ``master``
124-
without interfering with the output from the comparison. More detail?
124+
without interfering with the output from the comparison. More detail?
125125
Note the three dots in the URL above (``master...my-new-feature``).
126126

127127
.. admonition:: Two vs three dots
@@ -165,7 +165,7 @@ When you are ready to ask for the merge of your code:
165165
Merging from trunk
166166
==================
167167

168-
This updates your code from the upstream `nipype github`_ repo.
168+
This updates your code from the upstream `nipype github`_ repo.
169169

170170
Overview
171171
--------

doc/devel/gitwash/git_development.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ Contents:
1313
set_up_fork
1414
configure_git
1515
development_workflow
16-
16+

doc/devel/gitwash/git_resources.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Tutorials and summaries
99

1010
* `github help`_ has an excellent series of how-to guides.
1111
* `learn.github`_ has an excellent series of tutorials
12-
* The `pro git book`_ is a good in-depth book on git.
12+
* The `pro git book`_ is a good in-depth book on git.
1313
* A `git cheat sheet`_ is a page giving summaries of common commands.
14-
* The `git user manual`_
14+
* The `git user manual`_
1515
* The `git tutorial`_
1616
* The `git community book`_
1717
* `git ready`_ |emdash| a nice series of tutorials

doc/devel/gitwash/set_up_fork.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Set up your fork
55
==================
66

7-
First you follow the instructions for :ref:`forking`.
7+
First you follow the instructions for :ref:`forking`.
88

99
Overview
1010
========

doc/devel/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ conventions documented in the `NIPY Developers Guide
1515
:maxdepth: 2
1616

1717
writing_custom_interfaces
18-
gitwash/index
18+
gitwash/index
1919
architecture
2020
provenance
2121
software_using_nipype

doc/devel/interface_specs.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ base class down to subclasses).:
130130
``TraitedSpec``: Nipype's primary base class for all Specs.
131131
Provides initialization, some nipype-specific methods and any trait
132132
handlers we define. Inherits from traits.HasTraits.
133-
134-
``BaseInterfaceInputSpec``: Defines inputs common to all
133+
134+
``BaseInterfaceInputSpec``: Defines inputs common to all
135135
Interfaces (``ignore_exception``). If in doubt inherit from this.
136136

137137
``CommandLineInputSpec``: Defines inputs common to all
@@ -141,12 +141,12 @@ base class down to subclasses).:
141141
(``outputtype``)
142142

143143
``SPMCommandInputSpec``: Defines inputs common to all SPM classes (``matlab_cmd``, ``path``, and ``mfile``)
144-
144+
145145
``FSTraitedSpec``: Defines inputs common to all FreeSurfer classes
146146
(``sbjects_dir``)
147-
147+
148148
``MatlabInputSpec``: Defines inputs common to all Matlab classes (``script``, ``nodesktop``, ``nosplash``, ``logfile``, ``single_comp_thread``, ``mfile``, ``script_file``, and ``paths``)
149-
149+
150150
``SlicerCommandLineInputSpec``: Defines inputs common to all Slicer classes (``module``)
151151

152152
Most developers will only need to code at the the interface-level (i.e. implementing custom class inheriting from one of the above classes).
@@ -199,23 +199,23 @@ Common
199199
self.error( object, name, value )
200200
File "/Users/cburns/local/lib/python2.5/site-packages/enthought/traits/trait_handlers.py", line 175, in error
201201
value )
202-
TraitError: The 'infile' trait of a BetInputSpec instance must be a file
202+
TraitError: The 'infile' trait of a BetInputSpec instance must be a file
203203
name, but a value of 'does_not_exist.nii' <type 'str'> was specified.
204-
204+
205205
``hash_files``
206206
To be used with inputs that are defining output filenames. When this flag
207207
is set to false any Nipype will not try to hash any files described by this
208208
input. This is useful to avoid rerunning when the specified output file
209209
already exists and has changed.
210-
210+
211211
``desc``
212212
All trait objects have a set of default metadata attributes. ``desc``
213213
is one of those and is used as a simple, one-line docstring. The
214214
``desc`` is printed when users use the ``help()`` methods.
215215

216216
**Required:** This metadata is required by all nipype interface
217217
classes.
218-
218+
219219
``usedefault``
220220
Set this metadata to True when the *default value* for the trait type
221221
of this attribute is an acceptable value. All trait objects have a
@@ -257,7 +257,7 @@ Common
257257
<undefined>
258258
>>> rlgn.inputs.jobtype
259259
'estwrite'
260-
260+
261261
``xor`` and ``requires``
262262
Both of these accept a list of trait names. The ``xor`` metadata reflects
263263
mutually exclusive traits, while the requires metadata reflects traits
@@ -268,10 +268,10 @@ Common
268268
the help function.
269269

270270
``copyfile``
271-
This is metadata for a File or Directory trait that is relevant only in
272-
the context of wrapping an interface in a `Node` and `MapNode`. `copyfile`
273-
can be set to either `True` or `False`. `False` indicates that contents
274-
should be symlinked, while `True` indicates that the contents should be
271+
This is metadata for a File or Directory trait that is relevant only in
272+
the context of wrapping an interface in a `Node` and `MapNode`. `copyfile`
273+
can be set to either `True` or `False`. `False` indicates that contents
274+
should be symlinked, while `True` indicates that the contents should be
275275
copied over.
276276

277277
``min_ver`` and ``max_ver``
@@ -346,10 +346,10 @@ CommandLine
346346
generated for this parameter *if-and-only-if* the user did not provide
347347
one. The nipype convention is to automatically generate output
348348
filenames when not specified by the user both as a convenience for the
349-
user and so the pipeline can easily gather the outputs. Requires
349+
user and so the pipeline can easily gather the outputs. Requires
350350
``_gen_filename()`` method to be implemented. This way should be used if the
351351
desired file name is dependent on some runtime variables (such as file name
352-
of one of the inputs, or current working directory). In case when it should
352+
of one of the inputs, or current working directory). In case when it should
353353
be fixed it's recommended to just use ``usedefault``.
354354

355355
``sep``
@@ -393,7 +393,7 @@ and methods:
393393
* ``output_spec``: the OutputSpec
394394
* ``_list_outputs()``: Returns a dictionary containing names of generated files that are expected after package completes execution. This is used by ``BaseInterface.aggregate_outputs`` to gather all output files for the pipeline.
395395

396-
396+
397397
CommandLine
398398
^^^^^^^^^^^
399399

0 commit comments

Comments
 (0)