Skip to content

Commit 9bcbf39

Browse files
authored
Merge branch 'nf-core:master' into master
2 parents d3ac768 + 924841e commit 9bcbf39

257 files changed

Lines changed: 6082 additions & 6279 deletions

File tree

Some content is hidden

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

.github/actions/get-shards/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ runs:
2626
java-version: "17"
2727

2828
- name: Set up nf-test
29-
uses: nf-core/setup-nf-test@ce65500579e8587607aab289ecb3a9c343c32e79 # v2
29+
uses: nf-core/setup-nf-test@4069fbbaabe94c08faba4ad261bfa88225ba133f # v2
3030
with:
3131
version: ${{ env.NFT_VER }}
32-
install-pdiff: true
32+
install-fast-diff: true
3333

3434
- name: Get number of shards
3535
id: shards

.github/actions/nf-test-action/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ runs:
3737
python-version: "3.14"
3838

3939
- name: Set up nf-test
40-
uses: nf-core/setup-nf-test@ce65500579e8587607aab289ecb3a9c343c32e79 # v2
40+
uses: nf-core/setup-nf-test@4069fbbaabe94c08faba4ad261bfa88225ba133f # v2
4141
with:
4242
version: "${{ env.NFT_VER }}"
43-
install-pdiff: true
43+
install-fast-diff: true
4444

4545
- name: Set up apptainer
4646
if: contains(inputs.profile, 'singularity')
@@ -56,7 +56,7 @@ runs:
5656
5757
- name: Set up Conda
5858
if: ${{contains(inputs.profile, 'conda')}}
59-
uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3
59+
uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4
6060
with:
6161
auto-update-conda: true
6262
conda-solver: libmamba

.github/workflows/update-gpu-snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ jobs:
7171
python-version: "3.14"
7272

7373
- name: Set up nf-test
74-
uses: nf-core/setup-nf-test@ce65500579e8587607aab289ecb3a9c343c32e79 # v2
74+
uses: nf-core/setup-nf-test@4069fbbaabe94c08faba4ad261bfa88225ba133f # v2
7575
with:
7676
version: "${{ env.NFT_VER }}"
77-
install-pdiff: true
77+
install-fast-diff: true
7878

7979
- name: Update gpu snapshot
8080
id: update-gpu-snapshot

.github/workflows/update-sentieon-snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ jobs:
7474
python-version: "3.14"
7575

7676
- name: Set up nf-test
77-
uses: nf-core/setup-nf-test@ce65500579e8587607aab289ecb3a9c343c32e79 # v2
77+
uses: nf-core/setup-nf-test@4069fbbaabe94c08faba4ad261bfa88225ba133f # v2
7878
with:
7979
version: "${{ env.NFT_VER }}"
80-
install-pdiff: true
80+
install-fast-diff: true
8181

8282
# Set up secrets
8383
- name: Set up Nextflow secrets

modules/nf-core/affy/justrma/main.nf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ process AFFY_JUSTRMA {
33
label 'process_single'
44

55
conda "${moduleDir}/environment.yml"
6-
container "${ workflow.containerEngine in ['singularity', 'apptainer'] && !task.ext.singularity_pull_docker_container ?
7-
'https://depot.galaxyproject.org/singularity/bioconductor-affy:1.78.0--r43ha9d7317_1':
8-
'quay.io/biocontainers/bioconductor-affy:1.78.0--r43ha9d7317_1' }"
6+
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
7+
'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/62/62d22bc460807a1a4ded40e5b7a391aa6f2dac189d4153d684472d65333ca8d4/data':
8+
'community.wave.seqera.io/library/bioconductor-affy_r-base:dd8a5ecd6fc301b3' }"
99

1010
input:
1111
tuple val(meta), path(samplesheet), path(celfiles_dir)

modules/nf-core/ampcombi2/cluster/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ channels:
44
- conda-forge
55
- bioconda
66
dependencies:
7-
- bioconda::ampcombi=2.0.1
7+
- bioconda::ampcombi=3.0.0

modules/nf-core/ampcombi2/cluster/main.nf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ process AMPCOMBI2_CLUSTER {
44

55
conda "${moduleDir}/environment.yml"
66
container "${ workflow.containerEngine in ['singularity', 'apptainer'] && !task.ext.singularity_pull_docker_container ?
7-
'https://depot.galaxyproject.org/singularity/ampcombi:2.0.1--pyhdfd78af_0':
8-
'quay.io/biocontainers/ampcombi:2.0.1--pyhdfd78af_0' }"
7+
'https://depot.galaxyproject.org/singularity/ampcombi:3.0.0--pyhdfd78af_0':
8+
'quay.io/biocontainers/ampcombi:3.0.0--pyhdfd78af_0' }"
99

1010
input:
1111
path(summary_file)

modules/nf-core/ampcombi2/cluster/meta.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ tools:
1414
- ampcombi2/cluster:
1515
description: "A tool for clustering all AMP hits found across many samples and
1616
supporting many AMP prediction tools."
17-
homepage: "https://github.com/Darcy220606/AMPcombi"
18-
documentation: "https://github.com/Darcy220606/AMPcombi"
19-
tool_dev_url: "https://github.com/Darcy220606/AMPcombi/tree/dev"
17+
homepage: "https://github.com/paleobiotechnology/AMPcombi"
18+
documentation: "https://ampcombi.readthedocs.io"
19+
tool_dev_url: "https://github.com/paleobiotechnology/AMPcombi/tree/dev"
2020
licence: ["MIT"]
2121
identifier: ""
2222

@@ -80,3 +80,4 @@ authors:
8080
- "@darcy220606"
8181
maintainers:
8282
- "@darcy220606"
83+
- "@jasmezz"

modules/nf-core/ampcombi2/cluster/tests/main.nf.test.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
[
99
"AMPCOMBI2_CLUSTER",
1010
"ampcombi",
11-
"2.0.1"
11+
"3.0.0"
1212
]
1313
]
1414
}
1515
],
16-
"timestamp": "2026-03-11T15:43:28.198864",
16+
"timestamp": "2026-04-23T19:25:25.611433665",
1717
"meta": {
18-
"nf-test": "0.9.4",
18+
"nf-test": "0.9.5",
1919
"nextflow": "25.10.4"
2020
}
2121
},
@@ -35,14 +35,14 @@
3535
[
3636
"AMPCOMBI2_CLUSTER",
3737
"ampcombi",
38-
"2.0.1"
38+
"3.0.0"
3939
]
4040
]
4141
}
4242
],
43-
"timestamp": "2026-03-11T15:43:38.459512",
43+
"timestamp": "2026-04-23T19:25:56.951391865",
4444
"meta": {
45-
"nf-test": "0.9.4",
45+
"nf-test": "0.9.5",
4646
"nextflow": "25.10.4"
4747
}
4848
}

modules/nf-core/ampcombi2/complete/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ channels:
44
- conda-forge
55
- bioconda
66
dependencies:
7-
- bioconda::ampcombi=2.0.1
7+
- bioconda::ampcombi=3.0.0

0 commit comments

Comments
 (0)