Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: patch more modules #1082

Merged
merged 6 commits into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
NXF_VER:
- "22.10.1"
- "23.04.0"
- "latest-everything"
test:
- "default"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
TEST_DATA_BASE:
- "test-datasets/data"
NXF_VER:
- "22.10.1"
- "23.04.0"
- "latest-everything"
exclude:
# - profile: "conda"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ Pierikjaure is a previous spelling of Bierikjávrre.

- [#1073](https://github.com/nf-core/sarek/pull/1073) - Back to dev
- [#1080](https://github.com/nf-core/sarek/pull/1080) - Prepare release `3.2.1`
- [#1082](https://github.com/nf-core/sarek/pull/1082) - Bump minimal Nextflow version to 23.04.0

### Fixed

- [#1078](https://github.com/nf-core/sarek/pull/1078) - Update tabix/bgziptabix module to fix typo
- [#1079](https://github.com/nf-core/sarek/pull/1079) - Fixed typo in profile name for tower aws megatests
- [#1082](https://github.com/nf-core/sarek/pull/1082) - Patch more modules to use quay.io registry
- [#1082](https://github.com/nf-core/sarek/pull/1082) - Update `public_aws_ecr` profile
- [#1082](https://github.com/nf-core/sarek/pull/1082) - Add quay.io as singularity default registry

## [3.2.0](https://github.com/nf-core/sarek/releases/tag/3.2.0) - Bierikjávrre

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/sarek/results)
[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.3476426-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.3476425)

[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A522.10.1-23aa62.svg)](https://www.nextflow.io/)
[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A523.04.0-23aa62.svg)](https://www.nextflow.io/)
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)
[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)
Expand Down
15 changes: 15 additions & 0 deletions conf/public_aws_ecr.config
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,24 @@ process {
withName: 'CREATE_INTERVALS_BED' {
container = 'quay.io/biocontainers/gawk:5.1.0'
}
withName: 'DEEPVARIANT' {
container = 'quay.io/nf-core/deepvariant:1.5.0'
}
withName: 'DRAGMAP_ALIGN' {
container = 'quay.io/biocontainers/mulled-v2-580d344d9d4a496cd403932da8765f9e0187774d:5ebebbc128cd624282eaa37d2c7fe01505a91a69-0'
}
withName: 'GATK4_APPLYBQSR_SPARK' {
container = 'quay.io/nf-core/gatk:4.4.0.0'
}
withName: 'GATK4_BASERECALIBRATOR_SPARK' {
container = 'quay.io/nf-core/gatk:4.4.0.0'
}
withName: 'GATK4_CNNSCOREVARIANTS' {
container = 'quay.io/nf-core/gatk:4.4.0.0'
}
withName: 'GATK4_MARKDUPLICATES_SPARK' {
container = 'quay.io/nf-core/gatk:4.4.0.0'
}
withName: 'SAMBLASTER' {
container = 'quay.io/biocontainers/mulled-v2-19fa9f1a5c3966b63a24166365e81da35738c5ab:cee56b506ceb753d4bbef7e05b81e1bfc25d937f-0'
}
Expand Down
10 changes: 5 additions & 5 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
},
"deepvariant": {
"branch": "master",
"git_sha": "0460d316170f75f323111b4a2c0a2989f0c32013",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
},
"dragmap/align": {
Expand Down Expand Up @@ -168,7 +168,7 @@
},
"gatk4/applybqsrspark": {
"branch": "master",
"git_sha": "b9829e1064382745d8dff7f1d74d2138d2864f71",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
},
"gatk4/applyvqsr": {
Expand All @@ -183,7 +183,7 @@
},
"gatk4/baserecalibratorspark": {
"branch": "master",
"git_sha": "b9829e1064382745d8dff7f1d74d2138d2864f71",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
},
"gatk4/calculatecontamination": {
Expand All @@ -193,7 +193,7 @@
},
"gatk4/cnnscorevariants": {
"branch": "master",
"git_sha": "b9829e1064382745d8dff7f1d74d2138d2864f71",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
},
"gatk4/createsequencedictionary": {
Expand Down Expand Up @@ -263,7 +263,7 @@
},
"gatk4/markduplicatesspark": {
"branch": "master",
"git_sha": "b9829e1064382745d8dff7f1d74d2138d2864f71",
"git_sha": "4b7d4863a5883b76e6bff13b6e52468fab090c5b",
"installed_by": ["modules"]
},
"gatk4/mergemutectstats": {
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/deepvariant/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/gatk4/applybqsrspark/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/gatk4/baserecalibratorspark/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/gatk4/cnnscorevariants/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/gatk4/markduplicatesspark/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,12 @@ env {
// Capture exit codes from upstream processes when piping
process.shell = ['/bin/bash', '-euo', 'pipefail']

// Set default registry for Docker and Podman independent of -profile
// Will not be used unless Docker / Podman are enabled
// Set default registry for Docker, Singularity and Podman independent of -profile
// Will not be used unless Docker, Singularity and Podman are enabled
// Set to your registry if you have a mirror of containers
docker.registry = 'quay.io'
podman.registry = 'quay.io'
docker.registry = 'quay.io'
podman.registry = 'quay.io'
singularity.registry = 'quay.io'

def trace_timestamp = new java.util.Date().format( 'yyyy-MM-dd_HH-mm-ss')
timeline {
Expand All @@ -321,7 +322,7 @@ manifest {
homePage = 'https://github.com/nf-core/sarek'
description = """An open-source analysis pipeline to detect germline or somatic variants from whole genome or targeted sequencing"""
mainScript = 'main.nf'
nextflowVersion = '!>=22.10.1'
nextflowVersion = '!>=23.04.0'
version = '3.2.1'
doi = '10.12688/f1000research.16665.2, 10.5281/zenodo.4063683'
}
Expand Down