Skip to content

Commit d07c2e0

Browse files
authored
Merge pull request #940 from d4straub/fix-conda-2.16.0
Fix conda for upcoming release 2.16.0
2 parents 6707199 + 648e0f2 commit d07c2e0

20 files changed

+33
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ runs:
5353
auto-update-conda: true
5454
conda-solver: libmamba
5555
channels: conda-forge
56-
channel-priority: strict
56+
channel-priority: flexible # 'strict' would be preferable but 'flexible' is required for QIIME2 2024.10 conda yml file
5757
conda-remove-defaults: true
5858

5959
- name: Run nf-test

.github/workflows/nf-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- isMain: false
8080
profile: "singularity"
8181
NXF_VER:
82-
- "25.04.0"
82+
- "25.04.8"
8383
- "latest-everything"
8484
env:
8585
NXF_ANSI_LOG: false

CHANGELOG.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,31 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6-
## nf-core/ampliseq version 2.16.0 - 2025-12-19
6+
## nf-core/ampliseq version 2.16.0 - 2026-01-14
77

88
### `Added`
99

1010
### `Changed`
1111

12-
[#928](https://github.com/nf-core/ampliseq/pull/928) - Resource allocations were reduced for most smaller processes.
13-
[#931](https://github.com/nf-core/ampliseq/pull/931) - For `--dada_ref_taxonomy`, replace `sbdi-gtdb=R10-RS226-1` with updated database `sbdi-gtdb=R10-RS226-2` (see https://figshare.scilifelab.se/articles/dataset/SBDI_Sativa_curated_16S_GTDB_database/14869077/10)
12+
- [#928](https://github.com/nf-core/ampliseq/pull/928) - Resource allocations were reduced for most smaller processes.
13+
- [#931](https://github.com/nf-core/ampliseq/pull/931) - For `--dada_ref_taxonomy`, replace `sbdi-gtdb=R10-RS226-1` with updated database `sbdi-gtdb=R10-RS226-2` (see https://figshare.scilifelab.se/articles/dataset/SBDI_Sativa_curated_16S_GTDB_database/14869077/10)
1414

1515
### `Fixed`
1616

17-
[#926](https://github.com/nf-core/ampliseq/pull/926),[932](https://github.com/nf-core/ampliseq/pull/932) - Template update for nf-core/tools version 3.5.1
18-
[#929](https://github.com/nf-core/ampliseq/pull/929),[#935](https://github.com/nf-core/ampliseq/pull/935) - A bug in a dependency of MultiQC can lead (rarely) to plot generation being omitted, without warning. In that case, the subsequent pipeline summary report failed previously, now it gracefully handles that issue.
17+
- [#926](https://github.com/nf-core/ampliseq/pull/926),[932](https://github.com/nf-core/ampliseq/pull/932) - Template update for nf-core/tools version 3.5.1
18+
- [#929](https://github.com/nf-core/ampliseq/pull/929),[#935](https://github.com/nf-core/ampliseq/pull/935) - A bug in a dependency of MultiQC can lead (rarely) to plot generation being omitted, without warning. In that case, the subsequent pipeline summary report failed previously, now it gracefully handles that issue.
1919

2020
### `Dependencies`
2121

22-
- [#936](https://github.com/nf-core/ampliseq/pull/936) - Updated some software versions
22+
- [#936](https://github.com/nf-core/ampliseq/pull/936),[#940](https://github.com/nf-core/ampliseq/pull/940) - Updated some software versions
2323

24-
| software | previously | now |
25-
| -------- | ---------- | ------ |
26-
| Cutadapt | 4.6 | 5.2 |
27-
| DADA2 | 1.30.0 | 1.34.0 |
28-
| Phyloseq | 1.46.0 | 1.50.0 |
29-
| MultiQC | 1.29 | 1.33 |
24+
| software | previously | now |
25+
| -------- | ---------- | --------- |
26+
| nextflow | >=25.04.0 | >=25.04.8 |
27+
| Cutadapt | 4.6 | 5.2 |
28+
| DADA2 | 1.30.0 | 1.34.0 |
29+
| Phyloseq | 1.46.0 | 1.50.0 |
30+
| MultiQC | 1.29 | 1.33 |
3031

3132
### `Removed`
3233

README.md

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

1212
[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.1493841-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.1493841)[![Cite Publication](https://img.shields.io/badge/Cite%20Us!-Cite%20Publication-important?labelColor=000000)](https://doi.org/10.3389/fmicb.2020.550420)
1313

14-
[![Nextflow](https://img.shields.io/badge/version-%E2%89%A525.04.0-green?style=flat&logo=nextflow&logoColor=white&color=%230DC09D&link=https%3A%2F%2Fnextflow.io)](https://www.nextflow.io/)
14+
[![Nextflow](https://img.shields.io/badge/version-%E2%89%A525.04.8-green?style=flat&logo=nextflow&logoColor=white&color=%230DC09D&link=https%3A%2F%2Fnextflow.io)](https://www.nextflow.io/)
1515
[![nf-core template version](https://img.shields.io/badge/nf--core_template-3.5.1-green?style=flat&logo=nfcore&logoColor=white&color=%2324B064&link=https%3A%2F%2Fnf-co.re)](https://github.com/nf-core/tools/releases/tag/3.5.1)
1616
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
1717
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)

modules/local/cutadapt_summary_merge.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ process CUTADAPT_SUMMARY_MERGE {
22
tag "${files}"
33
label 'process_single'
44

5-
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3"
5+
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3 conda-forge::tbb=2020.2"
66
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
77
'https://depot.galaxyproject.org/singularity/bioconductor-dada2:1.34.0--r44he5774e6_2' :
88
'biocontainers/bioconductor-dada2:1.34.0--r44he5774e6_2' }"

modules/local/dada2_addspecies.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ process DADA2_ADDSPECIES {
44
label 'process_medium_memory'
55
label 'process_long'
66

7-
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3"
7+
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3 conda-forge::tbb=2020.2"
88
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
99
'https://depot.galaxyproject.org/singularity/bioconductor-dada2:1.34.0--r44he5774e6_2' :
1010
'biocontainers/bioconductor-dada2:1.34.0--r44he5774e6_2' }"

modules/local/dada2_denoising.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ process DADA2_DENOISING {
44
label 'process_long'
55
label 'error_retry'
66

7-
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3"
7+
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3 conda-forge::tbb=2020.2"
88
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
99
'https://depot.galaxyproject.org/singularity/bioconductor-dada2:1.34.0--r44he5774e6_2' :
1010
'biocontainers/bioconductor-dada2:1.34.0--r44he5774e6_2' }"

modules/local/dada2_err.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ process DADA2_ERR {
22
tag "$meta.run"
33
label 'process_medium'
44

5-
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3"
5+
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3 conda-forge::tbb=2020.2"
66
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
77
'https://depot.galaxyproject.org/singularity/bioconductor-dada2:1.34.0--r44he5774e6_2' :
88
'biocontainers/bioconductor-dada2:1.34.0--r44he5774e6_2' }"

modules/local/dada2_filtntrim.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ process DADA2_FILTNTRIM {
22
tag "$meta.id"
33
label 'process_low'
44

5-
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3"
5+
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3 conda-forge::tbb=2020.2"
66
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
77
'https://depot.galaxyproject.org/singularity/bioconductor-dada2:1.34.0--r44he5774e6_2' :
88
'biocontainers/bioconductor-dada2:1.34.0--r44he5774e6_2' }"

modules/local/dada2_quality.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ process DADA2_QUALITY {
22
tag "$meta"
33
label 'process_low'
44

5-
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3"
5+
conda "bioconda::bioconductor-dada2=1.34.0 conda-forge::r-base=4.4.3 conda-forge::tbb=2020.2"
66
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
77
'https://depot.galaxyproject.org/singularity/bioconductor-dada2:1.34.0--r44he5774e6_2' :
88
'biocontainers/bioconductor-dada2:1.34.0--r44he5774e6_2' }"

0 commit comments

Comments
 (0)