From 5162e34fd22fd4af60a4516db77d6f2a2572e8e0 Mon Sep 17 00:00:00 2001 From: Jonathan Manning Date: Tue, 8 Aug 2023 14:47:24 +0100 Subject: [PATCH 1/3] Upgrade the untar module --- modules.json | 2 +- modules/nf-core/untar/main.nf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.json b/modules.json index 030893337..3bfa5aaea 100644 --- a/modules.json +++ b/modules.json @@ -221,7 +221,7 @@ }, "untar": { "branch": "master", - "git_sha": "5c460c5a4736974abde2843294f35307ee2b0e5e", + "git_sha": "d0b4fc03af52a1cc8c6fb4493b921b57352b1dd8", "installed_by": ["modules"] } } diff --git a/modules/nf-core/untar/main.nf b/modules/nf-core/untar/main.nf index 8cd1856c7..61461c391 100644 --- a/modules/nf-core/untar/main.nf +++ b/modules/nf-core/untar/main.nf @@ -2,7 +2,7 @@ process UNTAR { tag "$archive" label 'process_single' - conda "conda-forge::sed=4.7 bioconda::grep=3.4 conda-forge::tar=1.34" + conda "conda-forge::sed=4.7 conda-forge::grep=3.11 conda-forge::tar=1.34" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'https://depot.galaxyproject.org/singularity/ubuntu:20.04' : 'nf-core/ubuntu:20.04' }" From 04887bdc2e8d1aaa7d96c7149cc7fd027311d46c Mon Sep 17 00:00:00 2001 From: Jonathan Manning Date: Tue, 8 Aug 2023 14:52:32 +0100 Subject: [PATCH 2/3] Add to CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 951921723..1286a2459 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ Thank you to everyone else that has contributed by reporting bugs, enhancements - [PR #1051](https://github.com/nf-core/rnaseq/pull/1051) - Remove `public_aws_ecr` profile - [PR #1054](https://github.com/nf-core/rnaseq/pull/1054) - Template update to nf-core/tools v2.9 - [PR #1058](https://github.com/nf-core/rnaseq/pull/1058) - Use `nf-validation` plugin for parameter and samplesheet validation +- [PR #1068](https://github.com/nf-core/rnaseq/pull/1068) - Update untar ## [[3.12.0](https://github.com/nf-core/rnaseq/releases/tag/3.12.0)] - 2023-06-02 From 22fd5ffc7adeeb4e50dff0278fac0fd23afa3a2d Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Tue, 8 Aug 2023 19:34:02 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1286a2459..c589534d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ Thank you to everyone else that has contributed by reporting bugs, enhancements - [PR #1051](https://github.com/nf-core/rnaseq/pull/1051) - Remove `public_aws_ecr` profile - [PR #1054](https://github.com/nf-core/rnaseq/pull/1054) - Template update to nf-core/tools v2.9 - [PR #1058](https://github.com/nf-core/rnaseq/pull/1058) - Use `nf-validation` plugin for parameter and samplesheet validation -- [PR #1068](https://github.com/nf-core/rnaseq/pull/1068) - Update untar +- [PR #1068](https://github.com/nf-core/rnaseq/pull/1068) - Update `grep` version for `untar` module ## [[3.12.0](https://github.com/nf-core/rnaseq/releases/tag/3.12.0)] - 2023-06-02