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

Default registry to quay.io #3344

Merged
merged 21 commits into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a189d60
Add default registry for Docker and Podman to quay.io
adamrtalbot Apr 27, 2023
3f4f0cb
Use full URI for all modules
adamrtalbot Apr 27, 2023
6c4a22a
Merge branch 'master' into default_registry_to_quay.io
adamrtalbot Apr 27, 2023
2736486
More docker.io added to container specs
adamrtalbot Apr 27, 2023
8be31cd
More docker.io
adamrtalbot Apr 27, 2023
4cae287
Correct docker container for VEP
adamrtalbot Apr 27, 2023
35a2c33
Artifacts named after specific run
adamrtalbot Apr 27, 2023
1211817
Update universc image name to use nfcore/universc instead of bioconta…
adamrtalbot Apr 27, 2023
ec9b21c
Revert snpeff docker container to nfcore/snpeff
adamrtalbot Apr 27, 2023
849571a
Update cellranger/count md5sum tests
adamrtalbot Apr 27, 2023
6563ada
Remove eido md5sum because it doesn't work on conda
adamrtalbot Apr 27, 2023
671679c
Fix eido version string
adamrtalbot Apr 28, 2023
aef394a
correct md5sums
adamrtalbot Apr 28, 2023
1a97395
Omit gatk4 conda tools that don't work
adamrtalbot Apr 28, 2023
303796e
Remove slashes from tags for uploading artifacts
adamrtalbot Apr 28, 2023
8a78e49
bb22faef28dfb0b3b106bd5cc320bf09
adamrtalbot Apr 28, 2023
80d16a9
Correct string parsing for artifact upload
adamrtalbot Apr 28, 2023
4bb8ccb
Remove singularity gatk4/determinegermlinecontigploidy test because i…
adamrtalbot Apr 28, 2023
f1bd184
Merge branch 'master' into default_registry_to_quay.io
adamrtalbot Apr 28, 2023
8b03a98
fix-meta-liniting
sateeshperi Apr 28, 2023
e7c0a09
Merge remote-tracking branch 'sateesh/fix/v2.8-meta-linting-errors' i…
adamrtalbot May 2, 2023
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
20 changes: 19 additions & 1 deletion .github/workflows/pytest-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,18 @@ jobs:
tags: fcs/fcsadaptor
- profile: "conda"
tags: fcs/fcsgx
- profile: "conda"
tags: gatk4/baserecalibratorspark
- profile: "conda"
tags: gatk4/cnnscorevariants
- profile: "conda"
tags: gatk4/determinegermlinecontigploidy
- profile: "conda"
tags: gatk4/germlinecnvcaller
- profile: "conda"
tags: gatk4/markduplicatesspark
- profile: "conda"
tags: gatk4/postprocessgermlinecnvcalls
- profile: "conda"
tags: genescopefk
- profile: "conda"
Expand Down Expand Up @@ -122,6 +130,8 @@ jobs:
tags: universc
- profile: "singularity"
tags: universc
- profile: "singularity"
tags: gatk4/determinegermlinecontigploidy
- profile: "conda"
tags: subworkflows/bcl_demultiplex
- profile: "conda"
Expand Down Expand Up @@ -207,11 +217,19 @@ jobs:
sudo apt-get install bat > /dev/null
batcat --decorations=always --color=always /home/runner/pytest_workflow_*/*/log.{out,err}

- name: Setting global variables
uses: actions/github-script@v6
id: parsed
with:
script: |
return '${{ matrix.tags }}'.toLowerCase().replaceAll(/\//g, '-').trim('-').trim('"')
result-encoding: string

- name: Upload logs on failure
if: failure()
uses: actions/upload-artifact@v2
with:
name: logs-${{ matrix.profile }}
name: logs-${{ matrix.profile }}-${{ steps.parsed.outputs.result }}
path: |
/home/runner/pytest_workflow_*/*/.nextflow.log
/home/runner/pytest_workflow_*/*/log.out
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/bases2fastq/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process BASES2FASTQ {
tag "$meta.id"
label 'process_high'

container "elembio/bases2fastq:1.1.0"
container "docker.io/elembio/bases2fastq:1.1.0"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/basicpy/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ process BASICPY {
exit 1, "Basicpy module does not support Conda. Please use Docker / Singularity instead."
}

container "yfukai/basicpy-docker-mcmicro:0.2.1"
container "docker.io/yfukai/basicpy-docker-mcmicro:0.2.1"

input:
tuple val(meta), path(image)
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/basicpy/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tools:
homepage: "https://github.com/peng-lab/BaSiCPy"
documentation: "https://basicpy.readthedocs.io/en/latest/index.html"
tool_dev_url: "https://github.com/peng-lab/BaSiCPy"
doi: "doi: 10.1038/ncomms14836."
doi: 10.1038/ncomms14836
licence: "MIT License"

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/bcl2fastq/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process BCL2FASTQ {
tag {"$meta.lane" ? "$meta.id"+"."+"$meta.lane" : "$meta.id" }
label 'process_high'

container "nfcore/bcl2fastq:2.20.0.422"
container "docker.io/nfcore/bcl2fastq:2.20.0.422"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/bclconvert/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process BCLCONVERT {
tag {"$meta.lane" ? "$meta.id"+"."+"$meta.lane" : "$meta.id" }
label 'process_high'

container "nfcore/bclconvert:4.0.3"
container "docker.io/nfcore/bclconvert:4.0.3"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/cat/fastq/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ process CAT_FASTQ {
conda "conda-forge::sed=4.7"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'ubuntu:20.04' }"
'docker.io/ubuntu:20.04' }"

input:
tuple val(meta), path(reads, stageAs: "input*/*")
Expand Down
3 changes: 2 additions & 1 deletion modules/nf-core/cat/fastq/meta.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: cat_fastq
description: Concatenates fastq files
keywords:
- cat
- fastq
- concatenate
tools:
Expand All @@ -16,7 +17,7 @@ input:
Groovy Map containing sample information
e.g. [ id:'test', single_end:false ]
- reads:
type: list
type: file
description: |
List of input FastQ files to be concatenated.
output:
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/cellpose/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ process CELLPOSE {
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
exit 1, "I did not manage to create a cellpose module in Conda that works in all OSes. Please use Docker / Singularity / Podman instead."}

container "biocontainers/cellpose:2.1.1_cv2"
container "docker.io/biocontainers/cellpose:2.1.1_cv2"
ewels marked this conversation as resolved.
Show resolved Hide resolved

input:
tuple val(meta), path(image)
Expand Down
8 changes: 5 additions & 3 deletions modules/nf-core/cellpose/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ name: "cellpose"
description: cellpose segments cells in images
keywords:
- segmentation
- image
- cellpose
tools:
- "cellpose":
description: "cellpose is an anatomical segmentation algorithm written in Python 3 by Carsen Stringer and Marius Pachitariu"
homepage: "https://github.com/MouseLand/cellpose"
documentation: "https://cellpose.readthedocs.io/en/latest/command.html"
tool_dev_url: "https://github.com/MouseLand/cellpose"
doi: "https://doi.org/10.1038/s41592-022-01663-4"
doi: 10.1038/s41592-022-01663-4
licence: "BSD 3-Clause"

input:
Expand All @@ -18,7 +20,7 @@ input:
Groovy Map containing sample information
(sample id)
- image:
type: image stack
type: file
description: tif file for ready for segmentation
pattern: "*.{tif,tiff}"
- model:
Expand All @@ -36,7 +38,7 @@ output:
description: File containing software versions
pattern: "versions.yml"
- mask:
type: tif_file
type: file
description: labelled mask output from cellpose in tif format
pattern: "*.{tif, tiff}"

Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/coreograph/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process COREOGRAPH {
tag "$meta.id"
label 'process_single'

container "labsyspharm/unetcoreograph:2.2.9"
container "docker.io/labsyspharm/unetcoreograph:2.2.9"

input:
tuple val(meta), path(image)
Expand Down
4 changes: 2 additions & 2 deletions modules/nf-core/coreograph/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tools:
homepage: "https://mcmicro.org/parameters/core.html#coreograph"
documentation: "https://mcmicro.org/troubleshooting/tuning/coreograph.html"
tool_dev_url: "https://github.com/HMS-IDAC/UNetCoreograph"
doi: "https://doi.org/10.1038/s41592-021-01308-y"
doi: 10.1038/s41592-021-01308-y
licence: "MIT License"

input:
Expand All @@ -38,7 +38,7 @@ output:
pattern: "*.{tif}"

- masks:
type: files
type: file
description: Binary masks for the Complete/Incomplete tissue cores
pattern: "./masks/*.{tif}"

Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/custom/tabulartogseacls/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ process CUSTOM_TABULARTOGSEACLS {
conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'ubuntu:20.04' }"
'docker.io/ubuntu:20.04' }"

input:
tuple val(meta), path(samples)
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/custom/tabulartogseagct/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ process CUSTOM_TABULARTOGSEAGCT {
conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'ubuntu:20.04' }"
'docker.io/ubuntu:20.04' }"

input:
tuple val(meta), path(tabular)
Expand Down
1 change: 1 addition & 0 deletions modules/nf-core/custom/tabulartogseagct/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ description: Convert a TSV or CSV with features by row and observations by colum
keywords:
- gsea
- gct
- tabular
tools:
- tabulartogseagct:
description: "Convert a TSV or CSV with features by row and observations by column to a GCT format file as consumed by GSEA"
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/deepcell/mesmer/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process DEEPCELL_MESMER {
tag "$meta.id"
label 'process_single'

container "vanvalenlab/deepcell-applications:0.4.1"
container "docker.io/vanvalenlab/deepcell-applications:0.4.1"

input:
tuple val(meta) , path(img)
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/deepcell/mesmer/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tools:
homepage: "https://github.com/vanvalenlab/deepcell-tf"
documentation: "https://github.com/vanvalenlab/intro-to-deepcell/tree/master/pretrained_models"
tool_dev_url: "https://githu/b.com/vanvalenlab/deepcell-tf"
doi: "https://doi.org/10.1038/s41587-021-01094-0"
doi: 10.1038/s41587-021-01094-0
licence: "APACHE2"

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/deepvariant/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process DEEPVARIANT {
tag "$meta.id"
label 'process_medium'

container "google/deepvariant:1.4.0"
container "docker.io/google/deepvariant:1.4.0"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Expand Down
1 change: 1 addition & 0 deletions modules/nf-core/deepvariant/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ description: DeepVariant is an analysis pipeline that uses a deep neural network
keywords:
- variant calling
- machine learning
- neural network
tools:
- deepvariant:
description: DeepVariant is an analysis pipeline that uses a deep neural network to call genetic variants from next-generation DNA sequencing data
Expand Down
4 changes: 2 additions & 2 deletions modules/nf-core/eido/convert/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ process EIDO_CONVERT {
conda "conda-forge::eido=0.1.9"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://containers.biocontainers.pro/s3/SingImgsRepo/eido/0.1.9_cv1/eido_0.1.9_cv1.sif' :
'biocontainers/eido:0.1.9_cv1' }"
'docker.io/biocontainers/eido:0.1.9_cv1' }"

input:
path samplesheet
Expand All @@ -32,7 +32,7 @@ process EIDO_CONVERT {

cat <<-END_VERSIONS > versions.yml
"${task.process}":
eido: \$(echo \$(eido --version 2>&1) | sed 's/^.*eido //;s/ .*//' ))
eido: \$(echo \$(eido --version 2>&1) | sed 's/^.*eido //;s/ .*//' )
END_VERSIONS
"""
}
2 changes: 1 addition & 1 deletion modules/nf-core/eido/convert/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ input:
description: Nextflow samplesheet or PEP project
pattern: "*.{yaml,yml,csv}"
- format:
type: value
type: string
description: Extension of an output file
- pep_input_base_dir:
type: file
Expand Down
4 changes: 2 additions & 2 deletions modules/nf-core/eido/validate/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ process EIDO_VALIDATE {
conda "conda-forge::eido=0.1.9"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://containers.biocontainers.pro/s3/SingImgsRepo/eido/0.1.9_cv2/eido_0.1.9_cv2.sif' :
'biocontainers/eido:0.1.9_cv2' }"
'docker.io/biocontainers/eido:0.1.9_cv2' }"

input:
path samplesheet
Expand All @@ -27,7 +27,7 @@ process EIDO_VALIDATE {

cat <<-END_VERSIONS > versions.yml
"${task.process}":
eido: \$(echo \$(eido --version 2>&1) | sed 's/^.*eido //;s/ .*//' ))
eido: \$(echo \$(eido --version 2>&1) | sed 's/^.*eido //;s/ .*//' )
END_VERSIONS
"""
}
4 changes: 2 additions & 2 deletions modules/nf-core/fqtk/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ description: Demultiplex fastq files
keywords:
- demultiplex
- fastq
- rust
tools:
- "fqtk":
description: "A toolkit for working with FASTQ files, written in Rust."
homepage: "https://github.com/fulcrumgenomics/fqtk"
documentation: "https://github.com/fulcrumgenomics/fqtk"
tool_dev_url: "None"
licence: "['MIT']"

input:
Expand All @@ -22,7 +22,7 @@ input:
description: Tsv file, with two columns sample_id and barcode
pattern: "*.{tsv}"
- fastq_readstructure_pairs:
type: list
type: map
description: List of lists i.e. [[<fastq file name>, <read structure>, <absolute path to fastq directory>],...]

output:
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/gatk4/applybqsrspark/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process GATK4_APPLYBQSR_SPARK {
label 'process_low'

conda "bioconda::gatk4=4.3.0.0 conda-forge::openjdk=8.0.312"
container 'broadinstitute/gatk:4.4.0.0'
container 'docker.io/broadinstitute/gatk:4.4.0.0'

input:
tuple val(meta), path(input), path(input_index), path(bqsr_table), path(intervals)
Expand Down
1 change: 1 addition & 0 deletions modules/nf-core/gatk4/applybqsrspark/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ description: Apply base quality score recalibration (BQSR) to a bam file
keywords:
- bqsr
- bam
- gatk
tools:
- gatk4:
description: |
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/gatk4/baserecalibratorspark/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process GATK4_BASERECALIBRATOR_SPARK {
label 'process_low'

conda "bioconda::gatk4=4.4.0.0 conda-forge::openjdk=8.0.312"
container 'broadinstitute/gatk:4.4.0.0'
container 'docker.io/broadinstitute/gatk:4.4.0.0'

input:
tuple val(meta), path(input), path(input_index), path(intervals)
Expand Down
2 changes: 2 additions & 0 deletions modules/nf-core/gatk4/baserecalibratorspark/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: gatk4_baserecalibrator_spark
description: Generate recalibration table for Base Quality Score Recalibration (BQSR)
keywords:
- sort
- bqsr
- gatk
tools:
- gatk4:
description: |
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/gatk4/cnnscorevariants/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process GATK4_CNNSCOREVARIANTS {
label 'process_low'

//Conda is not supported at the moment: https://github.com/broadinstitute/gatk/issues/7811
container "broadinstitute/gatk:4.4.0.0" //Biocontainers is missing a package
container "docker.io/broadinstitute/gatk:4.4.0.0" //Biocontainers is missing a package

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process GATK4_DETERMINEGERMLINECONTIGPLOIDY {
label 'process_single'

//Conda is not supported at the moment: https://github.com/broadinstitute/gatk/issues/7811
container "broadinstitute/gatk:4.4.0.0" //Biocontainers is missing a package
container "docker.io/broadinstitute/gatk:4.4.0.0" //Biocontainers is missing a package

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ input:
Groovy Map containing sample information
e.g. [ id:'test', single_end:false ]
- counts:
type: file(s)
type: file
description: One or more count TSV files created with gatk/collectreadcounts
pattern: "*.tsv"
- bed:
type: file
description: Optional - A bed file containing the intervals to include in the process
pattern: "*.bed"
- exclude_beds:
type: file(s)
type: file
description: Optional - One or more bed files containing intervals to exclude from the process
pattern: "*.bed"
- contig_ploidy_table:
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/gatk4/germlinecnvcaller/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process GATK4_GERMLINECNVCALLER {
label 'process_single'

//Conda is not supported at the moment: https://github.com/broadinstitute/gatk/issues/7811
container "broadinstitute/gatk:4.4.0.0" //Biocontainers is missing a package
container "docker.io/broadinstitute/gatk:4.4.0.0" //Biocontainers is missing a package

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
Expand Down
Loading