Skip to content

Commit 9f87033

Browse files
committed
Merge remote-tracking branch 'origin/release'
2 parents 480459a + e4f63e0 commit 9f87033

File tree

5 files changed

+15
-19
lines changed

5 files changed

+15
-19
lines changed

src/faq.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ the file using the new name for subsequent steps or as a workflow-level output.
8787

8888
There are two ways to reference a local script:
8989

90-
The first method involves adding the folder containing your scripts to the `PATH` environment variable.
91-
This allows you to run the shell script directly without using `sh` or `bash` commands.
90+
The first method involves adding the path to a folder containing your scripts to the `PATH` environment variable. This
91+
allows you to execute the shell script directly (without explicitly using the `sh` or `bash` commands).
9292

9393
Start with adding a _shebang_ at the top of your file:
9494

@@ -135,10 +135,6 @@ baseCommand: sh
135135
outputs: []
136136
```
137137

138-
```{note}
139-
In CWL, everything must be directly stated.
140-
```
141-
142138
## How can I set `self`-based input bindings for optional inputs?
143139

144140
Currently, `cwltool` can't cope with missing optional inputs if their

src/introduction/basic-concepts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ in detail in the [Requirements](../topics/requirements-and-hints.md) section.
159159
> machine accessibility and that all digital assets should be Findable,
160160
> Accessible, Interoperable, and Reusable. Workflows encode the methods
161161
> by which the scientific process is conducted and via which data are
162-
> created. It is thus important that workflows support the creation
163-
> of FAIR data and adhere to the FAIR principles.
162+
> created. It is thus important that workflows both support the creation
163+
> of FAIR data and themselves adhere to the FAIR principles.
164164
> [FAIR Computational Workflows](https://workflows.community/groups/fair/),
165165
> Workflows Community Initiative.
166166

src/introduction/prerequisites.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ of the following options for your operating system:
2626
- Windows
2727

2828
```{note}
29-
If you are using Windows, you will have to install the [Windows Subsystem for Linux 2](https://learn.microsoft.com/en-us/windows/wsl/install) (WSL2).
30-
Visit the `cwltool` [documentation](https://cwltool.readthedocs.io/en/latest/#ms-windows-users)
31-
for details on installing WSL2.
29+
If you are using Windows, you will have to install the Windows Subsystem for Linux 2 as documented in the
30+
[`cwltool` documentation for Microsoft Windows users](https://github.com/common-workflow-language/cwltool/blob/main/README.rst#ms-windows-users).
3231
Your operating system also needs internet access and a recent version of Python (3.6+).
3332
```
3433

@@ -76,7 +75,7 @@ You can run the CWL tool description by omitting the `--validate` option:
7675
:caption: Running `true.cwl` with `cwltool`.
7776
```
7877

79-
### Cwl-runner Python Module
78+
### Generic ``cwl-runner`` alias
8079

8180
`cwl-runner` is an implementation-agnostic alias for any CWL compliant runner. This simply means
8281
that the `cwl-runner` alias command can be invoked independently, and is not reliant on a particular

src/topics/command-line-tool.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ and in the [Outputs](../topics/outputs.md) sections.
6666

6767

6868
## Network Access
69-
This indicates whether a process requires outgoing IPv4/IPv6 network access.
70-
If a command-line tool is written manually in CWL v1.1+, there is a need to
71-
specify when network access is required.
69+
This indicates whether a process requires outgoing IPv4/IPv6 network
70+
access. Starting with CWL v1.1, programs are not granted network
71+
access by default, so you must include the requirement for network
72+
access in the specification of your tool.
7273

7374
```cwl
7475
cwlVersion: v1.2
@@ -80,6 +81,6 @@ requirements:
8081
```
8182

8283
```{note}
83-
CWL v1.0 command-line tools that are upgraded to v1.1
84-
or v1.2 get Network Access automatically.
84+
CWL v1.0 command-line tools that are upgraded to v1.1
85+
or v1.2 or v1.2 will have `networkAccess: true` set automatically.
8586
```

src/topics/operations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ style=dashed;
5353
}
5454
```
5555

56-
If you try running it with `cwltool`, the command will fail since `cwltool`
57-
does not have enough information to know how to execute it:
56+
The operation file will fail to run with `cwltool` because `cwltool`
57+
lacks the necessary information to execute it:
5858

5959
```{runcmd} cwltool operations.cwl --message Hello
6060
:working-directory: src/_includes/cwl/operations/

0 commit comments

Comments
 (0)