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

Dp24 jbrowse only #307

Merged
merged 21 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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 @@ -22,7 +22,7 @@ jobs:
name: Run pipeline with test data
# Only run on push if this is the nf-core dev branch (merged PRs)
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'sanger-tol/treeval') }}"
runs-on: ubuntu2204-8c
runs-on: [ubuntu-latest] # Let's see if Pretext errors are a architecture thing
strategy:
matrix:
NXF_VER:
Expand Down
14 changes: 14 additions & 0 deletions main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ WorkflowMain.initialise( workflow, params, log )
include { TREEVAL } from './workflows/treeval'
include { TREEVAL_RAPID } from './workflows/treeval_rapid'
include { TREEVAL_RAPID_TOL } from './workflows/treeval_rapid_tol'
include { TREEVAL_JBROWSE } from './workflows/treeval_jbrowse'

//
// WORKFLOW: RUN MAIN PIPELINE GENERATING ALL OUTPUT
Expand All @@ -47,6 +48,15 @@ workflow SANGERTOL_TREEVAL_RAPID_TOL {
TREEVAL_RAPID_TOL ()
}

//
// WORKFLOW: RUN ONLY THE SUBWORKFLOWS REQUIRED FOR JBROWSE UPLOAD
// - THIS IS TO COMPLEMENT A NEW PROCESS WHERE MAJORITY OF TICKETS WILL BE RC
// AND GET REQUESTED FOR FULL
//
workflow SANGERTOL_TREEVAL_JBROWSE {
TREEVAL_JBROWSE ()
}

/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
RUN ALL WORKFLOWS
Expand All @@ -68,6 +78,10 @@ workflow RAPID_TOL {
SANGERTOL_TREEVAL_RAPID_TOL ()
}

workflow JBROWSE {
SANGERTOL_TREEVAL_JBROWSE ()
}

/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
THE END
Expand Down
4 changes: 2 additions & 2 deletions modules/local/avgcov.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process AVGCOV {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val(meta), path(bedfile)
Expand Down
5 changes: 5 additions & 0 deletions modules/local/bamtobed_sort.nf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ process BAMTOBED_SORT {
'https://depot.galaxyproject.org/singularity/mulled-v2-9d3a458f6420e5712103ae2af82c94d26d63f059:60b54b43045e8cf39ba307fd683c69d4c57240ce-0' :
'biocontainers/mulled-v2-9d3a458f6420e5712103ae2af82c94d26d63f059:60b54b43045e8cf39ba307fd683c69d4c57240ce-0' }"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error "BAMTOBED_SORT module does not support Conda. Please use Docker / Singularity instead."
}

input:
tuple val(meta), path(bam)

Expand Down
4 changes: 2 additions & 2 deletions modules/local/chunkfasta.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process CHUNKFASTA {

conda "conda-forge::pyfasta=0.5.2-1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/pyfasta:0.5.2--py_1' :
'biocontainers/pyfasta:0.5.2--py_1' }"
'https://depot.galaxyproject.org/singularity/pyfasta:0.5.2--py_1' :
'biocontainers/pyfasta:0.5.2--py_1' }"

input:
tuple val(meta), path('input.fasta')
Expand Down
4 changes: 2 additions & 2 deletions modules/local/concatblocks.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process CONCATBLOCKS {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val(meta), path(mergeblocks)
Expand Down
5 changes: 5 additions & 0 deletions modules/local/cram_filter_align_bwamem2_fixmate_sort.nf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ process CRAM_FILTER_ALIGN_BWAMEM2_FIXMATE_SORT {
'https://depot.galaxyproject.org/singularity/mulled-v2-1a6fe65bd6674daba65066aa796ed8f5e8b4687b:688e175eb0db54de17822ba7810cc9e20fa06dd5-0' :
'biocontainers/mulled-v2-1a6fe65bd6674daba65066aa796ed8f5e8b4687b:688e175eb0db54de17822ba7810cc9e20fa06dd5-0' }"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error "CRAM_FILTER_ALIGN_BWAMEM2_FIXMATE_SORT module does not support Conda. Please use Docker / Singularity instead."
}

input:
tuple val(meta), path(cramfile), path(cramindex), val(from), val(to), val(base), val(chunkid), val(rglines), val(bwaprefix), path(reference)

Expand Down
5 changes: 5 additions & 0 deletions modules/local/cram_filter_minimap2_filter5end_fixmate_sort.nf
DLBPointon marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ process CRAM_FILTER_MINIMAP2_FILTER5END_FIXMATE_SORT {
'https://depot.galaxyproject.org/singularity/mulled-v2-1a6fe65bd6674daba65066aa796ed8f5e8b4687b:688e175eb0db54de17822ba7810cc9e20fa06dd5-0' :
'biocontainers/mulled-v2-1a6fe65bd6674daba65066aa796ed8f5e8b4687b:688e175eb0db54de17822ba7810cc9e20fa06dd5-0' }"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error "CRAM_FILTER_ALIGN_BWAMEM2_FIXMATE_SORT module does not support Conda. Please use Docker / Singularity instead."
}

input:
tuple val(meta), path(cramfile), path(cramindex), val(from), val(to), val(base), val(chunkid), val(rglines), val(ref), path(reference)

Expand Down
4 changes: 2 additions & 2 deletions modules/local/extract_buscogene.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ process EXTRACT_BUSCOGENE {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"


input:
Expand Down
10 changes: 5 additions & 5 deletions modules/local/extract_cov_iden.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ process EXTRACT_COV_IDEN {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)

output:
tuple val( meta ), file( "*.bed" ) , emit: punchlist
path "versions.yml" , emit: versions
tuple val(meta), file("*.bed") , emit: punchlist
path "versions.yml" , emit: versions

script:
def prefix = task.ext.prefix ?: "${meta.id}_${meta.type}_punchlist"
Expand Down
6 changes: 3 additions & 3 deletions modules/local/extract_repeat.nf
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ process EXTRACT_REPEAT {
'biocontainers/perl:5.26.2' }"

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)

output:
tuple val( meta ), path( "*.bed" ) , emit: bed
path "versions.yml" , emit: versions
tuple val(meta), path("*.bed") , emit: bed
path "versions.yml" , emit: versions

when:
task.ext.when == null || task.ext.when
Expand Down
12 changes: 6 additions & 6 deletions modules/local/extract_telo.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ process EXTRACT_TELO {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)

output:
tuple val( meta ), file( "*bed" ) , emit: bed
tuple val( meta ), file("*bedgraph"), emit: bedgraph
path "versions.yml" , emit: versions
tuple val(meta), file("*bed") , emit: bed
tuple val(meta), file("*bedgraph"), emit: bedgraph
path "versions.yml" , emit: versions

shell:
def prefix = task.ext.prefix ?: "${meta.id}"
Expand Down
11 changes: 8 additions & 3 deletions modules/local/find_telomere_regions.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ process FIND_TELOMERE_REGIONS {

container 'docker.io/library/gcc:10.4.0'

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error "FIND_TELOMERE_REGIONS module does not support Conda. Please use Docker / Singularity instead."
}

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)
val (telomereseq)

output:
tuple val( meta ), file( "*.telomere" ) , emit: telomere
path "versions.yml" , emit: versions
tuple val(meta), file("*.telomere") , emit: telomere
path "versions.yml" , emit: versions

script:
def prefix = task.ext.prefix ?: "${meta.id}"
Expand Down
9 changes: 4 additions & 5 deletions modules/local/find_telomere_windows.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ process FIND_TELOMERE_WINDOWS {
label 'process_low'

conda "bioconda::java-jdk=8.0.112"
container "${ workflow.containerEngine == 'singularity' &&
!task.ext.singularity_pull_docker_container ?
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/java-jdk:8.0.112--1' :
'biocontainers/java-jdk:8.0.112--1' }"

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)

output:
tuple val( meta ), file( "*.windows" ) , emit: windows
path "versions.yml" , emit: versions
tuple val(meta), file("*.windows") , emit: windows
path "versions.yml" , emit: versions

script:
def prefix = task.ext.prefix ?: "${meta.id}"
Expand Down
13 changes: 9 additions & 4 deletions modules/local/fkutils/fkprof/main.nf
DLBPointon marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ process FKUTILS_FKPROF {
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error "FIND_TELOMERE_REGIONS module does not support Conda. Please use Docker / Singularity instead."
}

input:
tuple val( meta ), path( reference )
tuple val( meta2 ), path( ktab )
tuple val(meta), path(reference)
tuple val(meta2), path(ktab)

output:
tuple val( meta ), file( "*bed" ), emit: bed
path "versions.yml", emit: versions
tuple val(meta), file("*bed"), emit: bed
path "versions.yml", emit: versions

script:
def args = task.ext.args ?: ""
Expand Down
10 changes: 5 additions & 5 deletions modules/local/gap_length.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ process GAP_LENGTH {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)

output:
tuple val( meta ), file( "*bedgraph" ) , emit: bedgraph
path "versions.yml" , emit: versions
tuple val(meta), file("*bedgraph") , emit: bedgraph
path "versions.yml" , emit: versions

shell:
def prefix = task.ext.prefix ?: "${meta.id}"
Expand Down
9 changes: 8 additions & 1 deletion modules/local/generate_cram_csv.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ process GENERATE_CRAM_CSV {
tag "${meta.id}"
label 'process_tiny'

container 'quay.io/sanger-tol/cramfilter_bwamem2_minimap2_samtools_perl:0.001-c1'
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/mulled-v2-1a6fe65bd6674daba65066aa796ed8f5e8b4687b:688e175eb0db54de17822ba7810cc9e20fa06dd5-0' :
'biocontainers/mulled-v2-1a6fe65bd6674daba65066aa796ed8f5e8b4687b:688e175eb0db54de17822ba7810cc9e20fa06dd5-0' }"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error "GENERATE_CRAM_CSV module does not support Conda. Please use Docker / Singularity instead."
}

input:
tuple val(meta), path(crampath)
Expand Down
6 changes: 3 additions & 3 deletions modules/local/get_largest_scaff.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ process GET_LARGEST_SCAFF {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)

output:
env largest_scaff , emit: scaff_size
Expand Down
10 changes: 5 additions & 5 deletions modules/local/get_paired_contact_bed.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ process GET_PAIRED_CONTACT_BED {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)

output:
tuple val( meta ), file( "*bed" ) , emit: bed
path "versions.yml" , emit: versions
tuple val(meta), file("*bed") , emit: bed
path "versions.yml" , emit: versions

script:
def pulled = '-T sort_tmp'
Expand Down
10 changes: 5 additions & 5 deletions modules/local/getminmaxpunches.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ process GETMINMAXPUNCHES{

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val(meta), path(bedfile)

output:
tuple val(meta), path ( '*zero.bed' ) , optional: true , emit: min
tuple val(meta), path ( '*max.bed' ) , optional: true , emit: max
path "versions.yml" , emit: versions
tuple val(meta), path ('*zero.bed') , optional: true , emit: min
tuple val(meta), path ('*max.bed') , optional: true , emit: max
path "versions.yml" , emit: versions

shell:
def VERSION = "9.1" // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions.
Expand Down
9 changes: 8 additions & 1 deletion modules/local/graphoverallcoverage.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ process GRAPHOVERALLCOVERAGE {
tag "$meta.id"
label "process_single"

container 'quay.io/sanger-tol/cramfilter_bwamem2_minimap2_samtools_perl:0.001-c1'
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/mulled-v2-1a6fe65bd6674daba65066aa796ed8f5e8b4687b:688e175eb0db54de17822ba7810cc9e20fa06dd5-0' :
'biocontainers/mulled-v2-1a6fe65bd6674daba65066aa796ed8f5e8b4687b:688e175eb0db54de17822ba7810cc9e20fa06dd5-0' }"

// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error "GRAPHOVERALLCOVERAGE module does not support Conda. Please use Docker / Singularity instead."
}

input:
tuple val(meta), path(bed)
Expand Down
3 changes: 1 addition & 2 deletions modules/local/juicer_tools_pre.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ process JUICER_TOOLS_PRE {
label 'process_medium'

conda "bioconda::java-jdk=8.0.112"
container "${ workflow.containerEngine == 'singularity' &&
!task.ext.singularity_pull_docker_container ?
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/java-jdk:8.0.112--1' :
'biocontainers/java-jdk:8.0.112--1' }"

Expand Down
10 changes: 5 additions & 5 deletions modules/local/paf_to_bed.nf
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ process PAF2BED {

conda "conda-forge::coreutils=9.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'docker.io/ubuntu:20.04' }"

input:
tuple val( meta ), path( file )
tuple val(meta), path(file)

output:
tuple val( meta ), file( "*_punchlist.bed" ), emit: punchlist
path "versions.yml" , emit: versions
tuple val(meta), file("*_punchlist.bed"), emit: punchlist
path "versions.yml" , emit: versions

script:
def prefix = task.ext.prefix ?: "${meta.id}_${meta.type}_punchlist"
Expand Down
Loading
Loading