Skip to content

Commit 865ad49

Browse files
authored
Merge pull request #1608 from alexsavio/master
WIP: Move nipype commands to a group command
2 parents bbd784c + 3e650d4 commit 865ad49

20 files changed

+487
-283
lines changed

bin/nipype2boutiques

Lines changed: 0 additions & 8 deletions
This file was deleted.

bin/nipype_cmd

Lines changed: 0 additions & 8 deletions
This file was deleted.

bin/nipype_crash_search

Lines changed: 0 additions & 82 deletions
This file was deleted.

bin/nipype_display_crash

Lines changed: 0 additions & 85 deletions
This file was deleted.

bin/nipype_display_pklz

Lines changed: 0 additions & 36 deletions
This file was deleted.

doc/users/cli.rst

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
.. _cli:
2+
3+
=============================
4+
Nipype Command Line Interface
5+
=============================
6+
7+
The Nipype Command Line Interface allows a variety of operations::
8+
9+
$ nipypecli
10+
Usage: nipypecli [OPTIONS] COMMAND [ARGS]...
11+
12+
Options:
13+
-h, --help Show this message and exit.
14+
15+
Commands:
16+
convert Export nipype interfaces to other formats.
17+
crash Display Nipype crash files.
18+
run Run a Nipype Interface.
19+
search Search for tracebacks content.
20+
show Print the content of Nipype node .pklz file.
21+
22+
These have replaced previous nipype command line tools such as
23+
`nipype_display_crash`, `nipype_crash_search`, `nipype2boutiques`,
24+
`nipype_cmd` and `nipype_display_pklz`.

doc/users/debug.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ performance issues.
2020
from nipype import config
2121
config.enable_debug_mode()
2222

23-
as the first import of your nipype script.
23+
as the first import of your nipype script. To enable debug logging use::
24+
25+
from nipype import logging
26+
logging.update_logging(config)
2427

2528
.. note::
2629

@@ -39,10 +42,10 @@ performance issues.
3942
node to fail without generating a crash file in the crashdump directory. In
4043
such cases, it will store a crash file in the `batch` directory.
4144

42-
#. All Nipype crashfiles can be inspected with the `nipype_display_crash`
45+
#. All Nipype crashfiles can be inspected with the `nipypecli crash`
4346
utility.
4447

45-
#. The `nipype_crash_search` command allows you to search for regular expressions
48+
#. The `nipypecli search` command allows you to search for regular expressions
4649
in the tracebacks of the Nipype crashfiles within a log folder.
4750

4851
#. Nipype determines the hash of the input state of a node. If any input
@@ -66,6 +69,6 @@ performance issues.
6669
PBS/LSF/SGE/Condor plugins in such cases the workflow may crash because it
6770
cannot retrieve the node result. Setting the `job_finished_timeout` can help::
6871

69-
workflow.config['execution']['job_finished_timeout'] = 65
72+
workflow.config['execution']['job_finished_timeout'] = 65
7073

7174
.. include:: ../links_names.txt

doc/users/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
plugins
2424
config_file
2525
debug
26-
26+
cli
2727

2828
.. toctree::
2929
:maxdepth: 1

nipype/info.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ def get_nipype_gitversion():
112112
FUTURE_MIN_VERSION = '0.15.2'
113113
SIMPLEJSON_MIN_VERSION = '3.8.0'
114114
PROV_MIN_VERSION = '1.4.0'
115+
CLICK_MIN_VERSION = '6.6.0'
115116

116117
NAME = 'nipype'
117118
MAINTAINER = 'nipype developers'
@@ -141,6 +142,7 @@ def get_nipype_gitversion():
141142
'future>=%s' % FUTURE_MIN_VERSION,
142143
'simplejson>=%s' % SIMPLEJSON_MIN_VERSION,
143144
'prov>=%s' % PROV_MIN_VERSION,
145+
'click>=%s' % CLICK_MIN_VERSION,
144146
'xvfbwrapper',
145147
'funcsigs'
146148
]

nipype/scripts/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)