Skip to content

Commit 7c75bbf

Browse files
authored
Merge branch 'master' into azure_batch_no_container_spec
2 parents d88452b + c6434d4 commit 7c75bbf

File tree

54 files changed

+494
-130
lines changed

Some content is hidden

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

54 files changed

+494
-130
lines changed
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Push release change log to Seqera Docs
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
inputs:
8+
release_name:
9+
description: "Release version (e.g. 1.0.0)"
10+
required: true
11+
release_body:
12+
description: "Release changelog content"
13+
required: true
14+
15+
jobs:
16+
update-docs:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
21+
- name: Clone seqeralabs/docs
22+
run: |
23+
git clone https://github.com/seqeralabs/docs.git seqeralabs-docs
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
27+
- name: Create changelog file
28+
run: |
29+
mkdir -p seqeralabs-docs/changelog/nextflow
30+
cat << EOF > seqeralabs-docs/changelog/nextflow/${{ github.event.release.name || inputs.release_name }}.mdx
31+
---
32+
title: Nextflow ${{ github.event.release.name || inputs.release_name }}
33+
date: $(date +%Y-%m-%d)
34+
tags: [nextflow]
35+
---
36+
37+
${{ github.event.release.body || inputs.release_body }}
38+
EOF
39+
40+
- uses: actions/create-github-app-token@v1
41+
id: generate-token
42+
with:
43+
app-id: ${{ secrets.DOCS_BOT_APP_ID }}
44+
private-key: ${{ secrets.DOCS_BOT_APP_PRIVATE_KEY }}
45+
owner: seqeralabs
46+
repositories: docs
47+
48+
- name: Create Pull Request
49+
uses: peter-evans/create-pull-request@v7
50+
with:
51+
token: ${{ steps.generate-token.outputs.token }}
52+
branch-token: ${{ steps.generate-token.outputs.token }}
53+
path: seqeralabs-docs
54+
commit-message: "Changelog: Nextflow ${{ github.event.release.name || inputs.release_name }}"
55+
title: "Changelog: Nextflow ${{ github.event.release.name || inputs.release_name }}"
56+
body: |
57+
This PR adds the changelog for Nextflow ${{ github.event.release.name || inputs.release_name }} to the Seqera documentation.
58+
59+
This is an automated PR created from the Nextflow repository.
60+
branch: changelog-nextflow-${{ github.event.release.name || inputs.release_name }}
61+
base: master
62+
delete-branch: true

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.10.0
1+
24.11.0-edge

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ allprojects {
109109

110110
// Documentation required libraries
111111
groovyDoc 'org.fusesource.jansi:jansi:2.4.0'
112-
groovyDoc "org.apache.groovy:groovy-groovydoc:4.0.23"
113-
groovyDoc "org.apache.groovy:groovy-ant:4.0.23"
112+
groovyDoc "org.apache.groovy:groovy-groovydoc:4.0.24"
113+
groovyDoc "org.apache.groovy:groovy-ant:4.0.24"
114114
}
115115

116116
test {

changelog.txt

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,61 @@
11
NEXTFLOW CHANGE-LOG
22
===================
3+
24.11.0-edge - 3 Dec 2024
4+
- Add GHA to submit dependencies to dependabot (#5440) [80395a6d]
5+
- Add NotFoundException to retry condition for Google Batch [aa4d19cc]
6+
- Add Rahel Hirsch to run name generator (#5442) [ff2bc6ae]
7+
- Add `env()` function (#5506) [fa0e8e0f]
8+
- Add more scientists to run name generator (#5447) [38d9eda0]
9+
- Add `singularity.libraryDir` to config page (#5498) [b5e31bb0]
10+
- Add RepositoryProvider.revision now public property (#5500) [f0a4c526]
11+
- Deprecate process `shell` block (#5508) [6f527551]
12+
- Detecting errors in data unstaging (#5345) [3c8e602d]
13+
- Disable virtual threads on CI tests [ci slip] [69d07dbc]
14+
- Fix Fargate warning on memory check (#5475) [bdf0ad00]
15+
- Fix `isContainerReady` when wave is disabled (#5509) [3215afa8]
16+
- Fix missing wave response (#5547) [ee252173]
17+
- Fix overlapping conda lock file (#5540) [9248c04d]
18+
- Fix overlapping conda lock exception (#5489) [eaaeb3de]
19+
- Fix possible deadlock in dynamic `maxRetry` resolution (#5474) [25bbb621]
20+
- Fix Wave GCP integration test (#5490) [ad56c89b]
21+
- Fixing bug when execution with stub and no stub defined (#5473) [f7fd56db]
22+
- Fix Incorrect CPU value in Azure example (#5549) [fc5e2c2a]
23+
- Improve docs for using the GPU accelerator directive (#5488) [4b908524]
24+
- Improve groupTuple docs with scatter/gather example (#5520) [b5c63a9f]
25+
- Prevent NPE with null AWS Batch response [12fc1d60]
26+
- Target Java 17 as minimal Java version (#5045) [0140f954]
27+
- Update 'nexus-staging' plugin to latest version (#5462) [07934513]
28+
- Update gradle 'shadow' plugin version to 8.3.5 (#5463) [2a5f15f0]
29+
- Update install docs to reflect change from 'all' to 'dist' (#5496) [c9115659]
30+
- Update process snippets to comply with strict syntax (#5526) [be1694bf]
31+
- Update Wave dependencies [09ccd295]
32+
- Bump aws sdk 1.12.777 (#5458) [8bad0b4b]
33+
- Bump bouncycastle to jdk18on:1.78.1 (#5467) [cd8c385f]
34+
- Bump com.azure:azure-identity from 1.11.3 to 1.12.2 (#5449) [cb70f1df]
35+
- Bump commons-io:2.15.1 [767e4a0a]
36+
- Bump groovy 4.0.24 [dd71ad31]
37+
- Bump netty-common to version 4.1.115.Final [d1bbd3d0]
38+
- Bump nf-amazon@2.10.0 [2b653b07]
39+
- Bump nf-azure@1.11.0 [6af7198d]
40+
- Bump nf-google@1.16.0 [9494f970]
41+
- Bump nf-google@1.8.0 [7e2c8d82]
42+
- Bump protobuf-java:3.25.5 to nf-google [488b7906]
43+
44+
24.10.2 - 27 Nov 2024
45+
- Prevent NPE with null AWS Batch response [3d491934]
46+
- Fix overlapping conda lock file (#5540) [df66deaa]
47+
- Fix missing wave response (#5547) [eb85cda8]
48+
- Bump nf-wave@1.7.4 [93d09404]
49+
- Bump nf-amazon@2.9.2 [469a35dd]
50+
51+
24.10.1 - 18 Nov 2024
52+
- Fix overlapping file lock exception (#5489) [a2566d54]
53+
- Fix isContainerReady when wave is disabled (#5509) [c69e3711]
54+
- Bump nf-wave@1.7.3 [e7709a0f]
55+
- Bump nf-azure@1.10.2 [54496ac4]
56+
- Bump nf-amazon@2.9.1 [fa227933]
57+
- Bump netty-common to version 4.1.115.Final [90623c1e]
58+
359
24.10.0 - 27 Oct 2024
460
- Add `manifest.contributors` config option (#5322) [cf0f9690]
561
- Add wave mirror and scan config [92e69776]

docs/_static/dag.mmd

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
%%{
2+
init: {
3+
'theme': 'base',
4+
'themeVariables': {
5+
'primaryColor': '#B6ECE2',
6+
'primaryTextColor': '#160F26',
7+
'primaryBorderColor': '#065647',
8+
'lineColor': '#545555',
9+
'clusterBkg': '#BABCBD22',
10+
'clusterBorder': '#DDDEDE',
11+
'fontFamily': 'arial'
12+
}
13+
}
14+
}%%
115
flowchart TB
216
subgraph " "
317
v0["Channel.fromFilePairs"]

docs/aws.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,8 @@ See the AWS documentation for details how to create the required AWS Batch queue
539539
and the Batch Execution Role.
540540

541541
:::{note}
542-
This feature requires the use {ref}`Wave <wave-page>` container provisioning service.
542+
Nextflow uses [s5cmd](https://github.com/peak/s5cmd) to download the task input data and upload the task outputs.
543+
To enable this capability, you need to enable the Wave service in the Nextflow configuration, as shown in the above example. See {ref}`Wave <wave-page>` documentation for more details.
543544
:::
544545

545546
## Advanced configuration

docs/azure.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Replacing `<PIPELINE NAME>` with a pipeline name e.g. `nextflow-io/rnaseq-nf` an
155155

156156
See the [Batch documentation](https://docs.microsoft.com/en-us/azure/batch/quick-create-portal) for further details about the configuration for Azure Batch.
157157

158-
### Pools configuration
158+
### Autopools
159159

160160
When using the `autoPoolMode` option, Nextflow automatically creates a `pool` of compute nodes appropriate for your pipeline.
161161

@@ -167,12 +167,12 @@ To specify multiple Azure machine families, use a comma separated list with glob
167167
process.machineType = "Standard_D*d_v5,Standard_E*d_v5"
168168
```
169169

170-
For example, the following process will create a pool of `Standard_E4d_v5` machines based when using `autoPoolMode`:
170+
For example, the following process will create a pool of `Standard_E8d_v5` machines based when using `autoPoolMode`:
171171

172172
```nextflow
173173
process EXAMPLE_PROCESS {
174174
machineType "Standard_E*d_v5"
175-
cpus 16
175+
cpus 8
176176
memory 8.GB
177177
178178
script:

modules/nextflow/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ dependencies {
2121
api(project(':nf-commons'))
2222
api(project(':nf-httpfs'))
2323
api "org.apache.groovy:groovy:4.0.24"
24-
api "org.apache.groovy:groovy-nio:4.0.23"
25-
api "org.apache.groovy:groovy-xml:4.0.23"
26-
api "org.apache.groovy:groovy-json:4.0.23"
27-
api "org.apache.groovy:groovy-templates:4.0.23"
28-
api "org.apache.groovy:groovy-yaml:4.0.23"
24+
api "org.apache.groovy:groovy-nio:4.0.24"
25+
api "org.apache.groovy:groovy-xml:4.0.24"
26+
api "org.apache.groovy:groovy-json:4.0.24"
27+
api "org.apache.groovy:groovy-templates:4.0.24"
28+
api "org.apache.groovy:groovy-yaml:4.0.24"
2929
api "org.slf4j:jcl-over-slf4j:2.0.7"
3030
api "org.slf4j:jul-to-slf4j:2.0.7"
3131
api "org.slf4j:log4j-over-slf4j:2.0.7"
@@ -39,7 +39,7 @@ dependencies {
3939
api "com.beust:jcommander:1.35"
4040
api("com.esotericsoftware.kryo:kryo:2.24.0") { exclude group: 'com.esotericsoftware.minlog', module: 'minlog' }
4141
api('org.iq80.leveldb:leveldb:0.12')
42-
api('org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r')
42+
api('org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r')
4343
api ('javax.activation:activation:1.1.1')
4444
api ('javax.mail:mail:1.4.7')
4545
api ('org.yaml:snakeyaml:2.2')
@@ -53,7 +53,7 @@ dependencies {
5353
testImplementation 'org.subethamail:subethasmtp:3.1.7'
5454

5555
// test configuration
56-
testFixturesApi ("org.apache.groovy:groovy-test:4.0.23") { exclude group: 'org.apache.groovy' }
56+
testFixturesApi ("org.apache.groovy:groovy-test:4.0.24") { exclude group: 'org.apache.groovy' }
5757
testFixturesApi ("org.objenesis:objenesis:3.4")
5858
testFixturesApi ("net.bytebuddy:byte-buddy:1.14.17")
5959
testFixturesApi ("org.spockframework:spock-core:2.3-groovy-4.0") { exclude group: 'org.apache.groovy' }

modules/nextflow/src/main/groovy/nextflow/executor/SimpleFileCopyStrategy.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class SimpleFileCopyStrategy implements ScriptFileCopyStrategy {
183183
return """\
184184
IFS=\$'\\n'
185185
for name in \$(eval "ls -1d ${escape.join(' ')}" | sort | uniq); do
186-
${stageOutCommand('$name', targetDir, mode)} || true
186+
${stageOutCommand('$name', targetDir, mode)}
187187
done
188188
unset IFS""".stripIndent(true)
189189
}

modules/nextflow/src/main/groovy/nextflow/scm/AssetManager.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ class AssetManager {
833833

834834
protected Map refToMap(Ref ref, Map<String,Ref> remote) {
835835
final entry = new HashMap(2)
836-
final peel = git.getRepository().peel(ref)
836+
final peel = git.getRepository().getRefDatabase().peel(ref)
837837
final objId = peel.getPeeledObjectId() ?: peel.getObjectId()
838838
// the branch or tag name
839839
entry.name = shortenRefName(ref.name)
@@ -867,7 +867,7 @@ class AssetManager {
867867
result << (name == current ? '*' : ' ')
868868

869869
if( level ) {
870-
def peel = git.getRepository().peel(ref)
870+
def peel = git.getRepository().getRefDatabase().peel(ref)
871871
def obj = peel.getPeeledObjectId() ?: peel.getObjectId()
872872
result << ' '
873873
result << formatObjectId(obj, level == 1)

0 commit comments

Comments
 (0)