Skip to content

Commit 83e3634

Browse files
Copilotewels
andauthored
Merge branch 'master' into more-gha-updates
Signed-off-by: GitHub <noreply@github.com> Co-authored-by: ewels <465550+ewels@users.noreply.github.com>
2 parents 6a03a53 + 3aa26a7 commit 83e3634

24 files changed

Lines changed: 252 additions & 105 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ concurrency:
2626
group: ${{ github.workflow }}-${{ github.ref }}
2727
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
2828

29+
2930
jobs:
3031
build:
3132
name: Build
@@ -256,6 +257,10 @@ jobs:
256257
permissions:
257258
contents: write
258259
steps:
260+
# Intentionally persists credentials: the `release` task in
261+
# packing.gradle runs `git push` and `git push origin vX.Y.Z` against
262+
# this repo; both rely on actions/checkout having written the token
263+
# into .git/config as http.extraheader.
259264
- name: Checkout
260265
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
261266
with:

.github/workflows/docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ concurrency:
1313
group: ${{ github.workflow }}-${{ github.ref }}
1414
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
1515

16+
1617
jobs:
1718
docs-build:
1819
name: Build

docs/cache-and-resume.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ channel.of(1,2,3).map { v -> def X=v; X+=2 }.view { v -> "ch1 = $v" }
141141
```
142142

143143
:::{versionadded} 25.04.0
144-
The {ref}`strict syntax <strict-syntax-page>` does not allow global variables to be declared in closures.
144+
The {ref}`strict parser <strict-syntax-page>` does not allow global variables to be declared in closures.
145145
:::
146146

147147
(cache-nondeterministic-inputs)=

docs/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ nextflow run main.nf -profile standard,cloud
320320
Nextflow applies config profiles in the order in which they were defined in the config, regardless of the order you specify them on the command line.
321321

322322
:::{versionadded} 25.04.0
323-
When using the {ref}`strict syntax <strict-syntax-page>`, Nextflow applies profiles in the order you specify them on the command line.
323+
When using the {ref}`strict parser <strict-syntax-page>`, Nextflow applies profiles in the order you specify them on the command line.
324324
:::
325325

326326
(config-workflow-handlers)=

docs/migrations/25-04.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
<h3>Strict syntax</h3>
1010

11-
The *strict syntax* is a strict parser for Nextflow DSL2 that implements the {ref}`Nextflow language specification <syntax-page>`. Originally introduced by the [Nextflow language server](https://github.com/nextflow-io/language-server) alongside Nextflow 24.10, the strict syntax is now available in the Nextflow CLI.
11+
The *strict syntax parser* is a strict implementation of Nextflow DSL2 based on the {ref}`Nextflow language specification <syntax-page>`. Originally introduced by the [Nextflow language server](https://github.com/nextflow-io/language-server) alongside Nextflow 24.10, the strict parser is now available in the Nextflow CLI.
1212

13-
The strict syntax is disabled by default. Enable it by setting the environment variable `NXF_SYNTAX_PARSER=v2`. See {ref}`strict-syntax-page` for details.
13+
The strict parser is disabled by default. Enable it by setting the environment variable `NXF_SYNTAX_PARSER=v2`. See {ref}`strict-syntax-page` for details.
1414

1515
<h3>Linting and formatting</h3>
1616

17-
The `nextflow lint` command checks Nextflow scripts and config files for errors using the {ref}`strict syntax <strict-syntax-page>`. It can also format Nextflow files using the same formatter as the Nextflow language server. See {ref}`cli-lint` for details.
17+
The `nextflow lint` command checks Nextflow scripts and config files for errors using the {ref}`strict parser <strict-syntax-page>`. It can also format Nextflow files using the same formatter as the Nextflow language server. See {ref}`cli-lint` for details.
1818

1919
(workflow-outputs-third-preview)=
2020

docs/migrations/25-10.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<h3>Workflow params</h3>
1010

1111
:::{note}
12-
Typed parameters require the {ref}`strict syntax <strict-syntax-page>`. Set the `NXF_SYNTAX_PARSER` environment variable to `v2` to enable:
12+
Typed parameters require the {ref}`strict parser <strict-syntax-page>`. Set the `NXF_SYNTAX_PARSER` environment variable to `v2` to enable:
1313

1414
```bash
1515
export NXF_SYNTAX_PARSER=v2
@@ -73,7 +73,7 @@ See {ref}`migrating-workflow-outputs` to get started.
7373
<h3>Static typing (preview)</h3>
7474

7575
:::{note}
76-
Static typing requires the {ref}`strict syntax <strict-syntax-page>`. Set the `NXF_SYNTAX_PARSER` environment variable to `v2` to enable:
76+
Static typing requires the {ref}`strict parser <strict-syntax-page>`. Set the `NXF_SYNTAX_PARSER` environment variable to `v2` to enable:
7777

7878
```bash
7979
export NXF_SYNTAX_PARSER=v2
@@ -209,7 +209,7 @@ Plugins should be updated to publish to the Nextflow plugin registry using the {
209209
<h3>New syntax for workflow handlers</h3>
210210

211211
:::{note}
212-
The new syntax for workflow handlers require the {ref}`strict syntax <strict-syntax-page>`. Set the `NXF_SYNTAX_PARSER` environment variable to `v2` to enable:
212+
The new syntax for workflow handlers requires the {ref}`strict parser <strict-syntax-page>`. Set the `NXF_SYNTAX_PARSER` environment variable to `v2` to enable:
213213

214214
```bash
215215
export NXF_SYNTAX_PARSER=v2
@@ -231,11 +231,11 @@ workflow {
231231
}
232232
```
233233

234-
This syntax is simpler and easier to use with the {ref}`strict syntax <strict-syntax-page>`. See {ref}`workflow-handlers` for details.
234+
This syntax is simpler and easier to use with the {ref}`strict parser <strict-syntax-page>`. See {ref}`workflow-handlers` for details.
235235

236236
<h3>Simpler syntax for dynamic directives</h3>
237237

238-
The {ref}`strict syntax <strict-syntax-page>` allows dynamic process directives to be specified without a closure:
238+
The {ref}`strict parser <strict-syntax-page>` allows dynamic process directives to be specified without a closure:
239239

240240
```nextflow
241241
process hello {
@@ -284,11 +284,11 @@ This feature addresses previous inconsistencies in timestamp representations.
284284

285285
## Deprecations
286286

287-
- The legacy type detection of CLI parameters is disabled when using the strict syntax (`NXF_SYNTAX_PARSER=v2`). {ref}`Legacy parameters <workflow-params-legacy>` in the strict syntax should not rely on legacy type detection. Alternatively, use the new `params` block to convert CLI parameters based on their type annotations. Legacy type detection can be disabled globally by setting the environment variable `NXF_DISABLE_PARAMS_TYPE_DETECTION=true`.
287+
- The legacy type detection of CLI parameters is disabled when using the strict parser (`NXF_SYNTAX_PARSER=v2`). {ref}`Legacy parameters <workflow-params-legacy>` should not rely on legacy type detection. Alternatively, use the new `params` block to convert CLI parameters based on their type annotations. Legacy type detection can be disabled globally by setting the environment variable `NXF_DISABLE_PARAMS_TYPE_DETECTION=true`.
288288

289289
- The use of workflow handlers in the configuration file has been deprecated. You should define workflow handlers in the pipeline script or a plugin instead. See {ref}`config-workflow-handlers` for details.
290290

291-
- The `nextflow.enable.configProcessNamesValidation` feature flag is deprecated. It was originally introduced to suppress false warnings for process selectors targeting conditional processes. The {ref}`strict syntax <strict-syntax-page>` now validates process selectors without producing false warnings.
291+
- The `nextflow.enable.configProcessNamesValidation` feature flag is deprecated. It was originally introduced to suppress false warnings for process selectors targeting conditional processes. The {ref}`strict parser <strict-syntax-page>` now validates process selectors without producing false warnings.
292292

293293
## Miscellaneous
294294

docs/migrations/26-04.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ A Platform access token with appropriate permissions is required to download non
382382

383383
## Deprecations
384384

385-
- The `nextflow.enable.strict` feature flag is deprecated. It is not needed when {ref}`strict syntax <strict-syntax-page>` is enabled.
385+
- The `nextflow.enable.strict` feature flag is deprecated. It is not needed when usiung the {ref}`strict parser <strict-syntax-page>`.
386386

387387
- The `manifest.defaultBranch` config option is deprecated. Nextflow can automatically detect the default branch when using a remote pipeline.
388388

docs/process-typed.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ process hello {
3030

3131
To use this feature:
3232

33-
1. Enable the {ref}`strict syntax <strict-syntax-page>` by setting the `NXF_SYNTAX_PARSER` environment variable to `v2`:
33+
1. Enable the {ref}`strict parser <strict-syntax-page>` by setting the `NXF_SYNTAX_PARSER` environment variable to `v2`:
3434

3535
```bash
3636
export NXF_SYNTAX_PARSER=v2

docs/process.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ Template scripts are generally discouraged due to the caveats described above. T
211211

212212
### Shell
213213

214-
:::{deprecated} 24.11.0-edge
215-
Use the `script` section instead. Consider using the {ref}`strict syntax <strict-syntax-page>`, which provides error checking to help distinguish between Nextflow variables and Bash variables in the process script.
214+
:::{deprecated} 25.04.0
215+
Use the `script` section instead.
216216
:::
217217

218218
The `shell` section is a string expression that defines the script that is executed by the process. It is an alternative to the {ref}`process-script` definition with one important difference: it uses the exclamation mark `!` character, instead of the usual dollar `$` character, to denote Nextflow variables.
@@ -1036,8 +1036,7 @@ The `tuple` qualifier outputs multiple values in a single output as a {ref}`tupl
10361036
```nextflow
10371037
process blast {
10381038
input:
1039-
val species
1040-
path query
1039+
tuple val(species), path(query)
10411040
10421041
output:
10431042
tuple val(species), path('result')
@@ -1052,7 +1051,7 @@ workflow {
10521051
ch_species = channel.of('human', 'cow', 'horse')
10531052
ch_query = channel.fromPath('*.fa')
10541053
1055-
blast(ch_species, ch_query)
1054+
blast(ch_species.combine(ch_query))
10561055
}
10571056
```
10581057

@@ -1257,7 +1256,7 @@ All directives can be assigned a dynamic value except the following:
12571256
:::{versionadded} 25.10
12581257
:::
12591258

1260-
Dynamic directives can be specified without a closure when using the {ref}`strict syntax <strict-syntax-page>`:
1259+
Dynamic directives can be specified without a closure when using the {ref}`strict parser <strict-syntax-page>`:
12611260

12621261
```nextflow
12631262
queue (entries > 100 ? 'long' : 'short')

docs/reference/env-vars.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,13 @@ The following environment variables control the configuration of the Nextflow ru
238238
: Enable the use of Spack recipes defined by using the {ref}`process-spack` directive. (default: `false`).
239239

240240
`NXF_SYNTAX_PARSER`
241-
: :::{versionadded} 25.02.0-edge
241+
: :::{versionadded} 25.04.0
242+
The strict parser is disabled by default.
243+
:::
244+
: :::{versionchanged} 26.04.0
245+
The strict parser is enabled by default.
242246
:::
243-
: Set to `'v2'` to use the {ref}`strict syntax <strict-syntax-page>` for Nextflow scripts and config files (default: `'v1'`).
247+
: Set to `'v2'` to use the {ref}`strict syntax parser <strict-syntax-page>` for Nextflow code. Set to `'v1'` to fall back to the legacy parser.
244248

245249
`NXF_TEMP`
246250
: Directory where temporary files are stored

0 commit comments

Comments
 (0)