Skip to content

Commit efa668a

Browse files
committed
more docs touch ups
1 parent 88a05bb commit efa668a

File tree

6 files changed

+135
-98
lines changed

6 files changed

+135
-98
lines changed

new-docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155

156156
# The name for this set of Sphinx documents. If None, it defaults to
157157
# "<project> v<release> documentation".
158-
html_title = "Pydra v{}".format(__version__)
158+
html_title = "Pydra v{}".format(version)
159159

160160
# A shorter title for the navigation bar. Default is the same as html_title.
161161
# html_short_title = 'Pydra v<release>'

new-docs/source/explanation/typing.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ more generic ``fileformats.generic.FsObject`` or ``fileformats.generic.FileSet``
3030

3131
The only cases where it isn't sufficient to use generic classes, is when there are
3232
implicit header or side cars assumed to be present adjacent to the primary file (e.g.
33-
a NIfTI file with an associated JSON sidecar file). Because in these cases, the
34-
header/sidecar file(s) will not be included in the hash calculation and may not be included in the
35-
movement of the "file set" between working directories. In these cases, you need to use the
36-
specific file format classes, such as ``fileformats.nifti.NiftiGzX``, which will check
37-
to see if the header/sidecar files are present.
33+
a NIfTI file `my_nifti.nii` with an associated JSON sidecar file `my_nifti.json`).
34+
Because the header/sidecar file(s) will not be included in the hash calculation
35+
by default and may be omitted if the "file set" is copied into a different work
36+
directories. In such cases, a specific file format class, such as
37+
``fileformats.nifti.NiftiGzX``, should be used instead.
3838

3939
Coercion
4040
--------

new-docs/source/index.rst

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
Pydra
44
=====
55

6-
Pydra is a lightweight, Python 3.11+ dataflow engine for computational graph construction,
7-
manipulation, and distributed execution. Designed as a successor to Nipype_,
8-
Pydra is a general-purpose engine that supports analytics in any scientific domain.
9-
Pydra helps build reproducible, scalable, reusable scientific workflows
10-
that combine Python functions and shell commands.
6+
Pydra is a lightweight Python dataflow engine for scientific analysis.
7+
Although designed as a successor to Nipype_, Pydra is supports analytics in any domain.
8+
Pydra helps build reproducible, scalable, reusable workflows that link processing tasks
9+
implemented in Python or shell commands to be executed on distributed compute platforms.
1110

12-
The power of Pydra lies in ease of constructing workflows, containing complex
13-
multiparameter map-reduce operations, in Python code and the use of a global cache (see
14-
:ref:`Design philosophy` for the rationale behind its design).
11+
The power of Pydra lies in ease of constructing workflows containing complex
12+
multiparameter map-reduce operations in Python code (see :ref:`Design philosophy` for
13+
the rationale behind its design).
1514

16-
**Key features**:
15+
**Key features:**
1716

1817
* Combine diverse tasks (`Python functions <./tutorial/3-python.html>`__ or `shell commands <./tutorial/4-shell.html>`__) into coherent `workflows <./tutorial/5-workflow.html>`__
19-
* Map-reduce like semantics (see :ref:`Splitting and combining`)
18+
* Concurrent execution on `choice of computing platform (e.g. workstation, SLURM, SGE, Dask, etc...) <./tutorial/2-advanced-execution.html#Workers>`__
2019
* Dynamic workflow construction using Python code (see :ref:`Dynamic construction`)
21-
* Modular backends for deployment on different execution platforms (e.g. cloud, HPC, etc...) (see `Execution options <./tutorial/2-advanced-execution.html>`__)
22-
* Support for the execution of tasks in containerized environments (see :ref:`Software environments`)
20+
* Map-reduce-like semantics (see :ref:`Splitting and combining`)
2321
* Global caching to reduce recomputation (see :ref:`Caches and hashes`)
24-
* Support for strong type-checking, including file types, at workflow construction time (see :ref:`Typing and file-formats`)
22+
* Tasks can be executed in separate software environments, e.g. containers (see :ref:`Software environments`)
23+
* Strong type-checking, including file types, before execution (see :ref:`Typing and file-formats`)
2524

2625

2726
Installation
@@ -32,21 +31,20 @@ therefore, it is straightforward to install via pip for Python >= 3.11
3231

3332
.. code-block:: bash
3433
35-
$ pip install pydra
34+
$ pip install pydra
3635
3736
Pre-designed tasks are available under the `pydra.tasks.*` package namespace. These tasks
38-
are implemented within separate packages that are typically specific to a given shell-command toolkit such as FSL_, AFNI_ or ANTs_,
39-
or a collection of related tasks/workflows (e.g. `niworkflows`_). Pip can be used to
40-
install these packages as well:
41-
37+
are implemented within separate packages that are typically specific to a given
38+
shell-command toolkit such as FSL_, AFNI_ or ANTs_, or a collection of related
39+
tasks/workflows (e.g. `niworkflows`_). Pip can be used to install these packages as well:
4240

4341
.. code-block:: bash
4442
45-
$ pip install pydra-fsl pydra-ants
43+
$ pip install pydra-fsl pydra-ants
4644
47-
Of course, if you use Pydra to execute commands within toolkits, you will need to
48-
either have those commands installed on the execution machine, or use containers
49-
environments (see `Environments <../explanation/environments.html>`__) to run them.
45+
Of course, if you use Pydra to execute commands within non-Python toolkits, you will
46+
need to either have those commands installed on the execution machine, or use containers
47+
to run them (see :ref:`Software environments`).
5048

5149

5250
Tutorials and notebooks
@@ -55,10 +53,14 @@ Tutorials and notebooks
5553
The following tutorials provide a step-by-step guide to using Pydra.
5654
They can be read in any order, but it is recommended to start with :ref:`Getting started`.
5755
The tutorials are implemented as Jupyter notebooks, which can be downloaded and run locally
58-
or run online using the |Binder| within each tutorial.
56+
or run online using the |Binder| button within each tutorial.
5957

6058
If you decide to download the notebooks and run locally, be sure to install the necessary
61-
dependencies with ``pip install -e /path/to/your/pydra[tutorial]``.
59+
dependencies with
60+
61+
.. code-block:: bash
62+
63+
$ pip install -e /path/to/your/pydra[tutorial]
6264
6365
6466
Execution
@@ -67,7 +69,7 @@ Execution
6769
Learn how to execute existing tasks (including workflows) on different systems
6870

6971
* :ref:`Getting started`
70-
* :ref:`Execution options`
72+
* :ref:`Advanced execution`
7173

7274
Design
7375
~~~~~~

0 commit comments

Comments
 (0)