8000 Pints by edmundmiller · Pull Request #58 · nf-core/nascent · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Pints #58

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 serv 8000 ice and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Oct 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1671b34
refactor(TI): Always run Homer and skip grohmm
edmundmiller Aug 29, 2022
2edb5d8
build(pints): Run nf-core modules install
edmundmiller Aug 31, 2022
7e16c57
feat(pints): Add initial module call
edmundmiller Aug 31, 2022
70eec25
fix(pints): Pull docker container for now
edmundmiller Sep 1, 2022
43aef9a
fix(pints): Use bidirectional peaks
edmundmiller Sep 7, 2022
a316b9e
fix(homer): factor => groseq
edmundmiller Sep 30, 2022
b5b0c81
feat(TI): Introduce assay_type to handle multiple assays
edmundmiller Sep 30, 2022
4c19d9b
test: Add copro and grocap configs
edmundmiller Oct 1, 2022
73ef7c8
style: Move bed2saf to correct sort
edmundmiller Oct 1, 2022
c92cd7f
docs: Add PINTS citation
edmundmiller Oct 3, 2022
882a803
feat(TI): Add bedtools intersect filter
edmundmiller Oct 3, 2022
6b650ef
fix(TI): Remove any empty bed files
edmundmiller Oct 4, 2022
2ca4cd1
fix(TI): Update bed2saf to have a meta
edmundmiller Oct 4, 2022
75e4958
fix(#50): Use group bams for featurecounts
edmundmiller Oct 4, 2022
99e7eeb
fix(TI): Add bedtools merge to combine all PINTS bed files
edmundmiller Oct 4, 2022
e15b8d9
refactor(TI): Move into separate subworkflow
edmundmiller Oct 4, 2022
029c9b5
test: Add a region file that works with test profile
edmundmiller Oct 4, 2022
a9d702c
chore: Collect all the versions
edmundmiller Oct 4, 2022
e6e89c0
chore: Update changelog
edmundmiller Oct 4, 2022
fbaadbb
fix(TI): Only run homer when assay is GROseq
edmundmiller Oct 5, 2022
b506b79
fix(TI): Use cat to combine bedfiles
edmundmiller Oct 5, 2022
456cedb
fix(TI): Change bedtools merge prefix
edmundmiller Oct 6, 2022 8000
c273e21
test: Add filter_bed to pints tests
edmundmiller Oct 6, 2022
0b55ffb
fix(TI): Sort bed file before merging
edmundmiller Oct 6, 2022
0ef2ee8
style(TI): Change short process calls to one line
edmundmiller Oct 6, 2022
0d61c1c
fix(TI): Replace bed2saf with awk script
edmundmiller Oct 11, 2022
435b8e1
ci: Remove local_modules workflow
edmundmiller Oct 12, 2022
bf99e34
chore: Remove default in schema
edmundmiller Oct 12, 2022
33cd2e3
chore: Remove old groovy files
edmundmiller Oct 12, 2022
338d675
style: Fix spacing
edmundmiller Oct 12, 2022
9ea9a76
chore: FIXME => TODO
edmundmiller Oct 12, 2022
8056f32
fix(TI): Remove multiqc calls
edmundmiller Oct 12, 2022
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
103 changes: 0 additions & 103 deletions .github/workflows/local_modules.yml

This file was deleted.

3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- [[#28](https://github.com/nf-core/nascent/issues/28)] - Added DRAGMAP alignment
- [[#64](https://github.com/nf-core/nascent/pull/64)] - Added CHM13 igenomes config
- [[#39](https://github.com/nf-core/nascent/issues/39)] - Add PINTS for TSS identification

### `Fixed`

- [[#33](https://github.com/nf-core/nascent/issues/33)] - groHMM works on full runs. Added the keep standard chromosomes function to standardize bam files.

### `Dependencies`

- Updated Nextflow version to `v21.10.3`
- Updated Nextflow version to `v21.10.6`

### `Deprecated`

Expand Down
4 changes: 4 additions & 0 deletions CITATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@

> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924.

- [PINTS](https://pints.yulab.org/)

> Yao, L., Liang, J., Ozer, A. et al. A comparison of experimental assays and analytical methods for genome-wide identification of active enhancers. Nat Biotechnol 40, 1056–1065 (2022). https://doi.org/10.1038/s41587-022-01211-7

- [preseq](https://pubmed.ncbi.nlm.nih.gov/23435259/)

> Daley T, Smith AD. Predicting the molecular complexity of sequencing libraries. Nat Methods. 2013 Apr;10(4):325-7. doi: 10.1038/nmeth.2375. Epub 2013 Feb 24. PubMed PMID: 23435259; PubMed Central PMCID: PMC3612374.
Expand Down
36 changes: 0 additions & 36 deletions bin/bed2saf.py

This file was deleted.

34 changes: 28 additions & 6 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ process {
}

withName: SUBREAD_FEATURECOUNTS_PREDICTED {
ext.prefix = { "${meta.id}-group_${annotation.baseName}-transcripts" }
ext.args = "-F \"SAF\""
publishDir = [
path: { "${params.outdir}/${params.aligner}/featurecounts/predicted" },
Expand All @@ -126,26 +127,47 @@ process {
}

withName: GROHMM_PARAMETERTUNING {
ext.when = { params.transcript_identification == "grohmm" && !params.skip_tuning }
ext.when = { !params.skip_grohmm && !params.skip_tuning && params.assay_type == "GROseq" }
}

withName: GROHMM_TRANSCRIPTCALLING {
ext.when = { params.transcript_identification == "grohmm" }
ext.when = { !params.skip_grohmm && params.assay_type == "GROseq" }
}

withName: HOMER_FINDPEAKS {
ext.when = { params.transcript_identification == "homer" }
ext.args = "-style factor"
ext.when = { params.assay_type == "GROseq" }
// TODO Handle other assays
ext.args = "-style groseq"
}

withName: HOMER_MAKETAGDIRECTORY {
ext.when = { params.transcript_identification == "homer" }
ext.when = { params.assay_type == "GROseq" }
ext.args = "-checkGC"
}

withName: HOMER_MAKEUCSCFILE {
ext.when = { params.transcript_identification == "homer" }
ext.when = { params.assay_type == "GROseq" }
ext.args = "-strand separate"
}

withName: PINTS_CALLER {
ext.args = { "--exp-type $params.assay_type" }
ext.singularity_pull_docker_container = true
}

withName: BEDTOOLS_SORT {
ext.prefix = { "${meta.id}_sorted" }
}

withName: BEDTOOLS_MERGE {
ext.args = "-header"
ext.prefix = { "${meta.id}_merged" }
}

withName: BEDTOOLS_INTERSECT_FILTER {
ext.when = { params.filter_bed }
ext.prefix = { "${meta.id}_filtered" }
ext.args = { no_overlap ? "-v": "" }
}

}
13 changes: 12 additions & 1 deletion conf/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,21 @@ params {
max_time = '6.h'

// Input data
input = "${baseDir}/assets/samplesheet.csv"
input = "${projectDir}/assets/samplesheet.csv"

// Genome references
fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21.fa'
gtf = 's3://ngi-igenomes/igenomes/Homo_sapiens/NCBI/GRCh38/Annotation/Genes/genes.gtf'

assay_type = "GROseq"
skip_grohmm = true
tuning_file = "${projectDir}/tests/subworkflows/local/grohmm/tuningparams_small.csv"
filter_bed = "${projectDir}/tests/samplesheets/region.bed"
}

process {
// FIXME https://github.com/hyulab/PINTS/issues/12
withName: PINTS_CALLER {
ext.when = false
}
}
23 changes: 23 additions & 0 deletions conf/test_copro.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Nextflow config file for running minimal tests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Defines input files and everything required to run a fast and simple pipeline test.

Use as follows:
nextflow run nf-core/nascent -profile test,<docker/singularity> --outdir <OUTDIR>

----------------------------------------------------------------------------------------
*/

params {
config_profile_name = 'CoPRO PINTS Test profile'
config_profile_description = 'Test dataset to check PINTS pipeline function(https://pints.yulab.org/tre_calling#part-iv-case-2)'

// Input data
input = "${projectDir}/tests/samplesheets/copro.csv"

genome = 'hg38'
assay_type = 'CoPRO'
filter_bed = "https://pints.yulab.org/ref/examples/promoters_1kb_tss_centered.bed.gz"
}
23 changes: 23 additions & 0 deletions conf/test_grocap.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Nextflow config file for running minimal tests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Defines input files and everything required to run a fast and simple pipeline test.

Use as follows:
nextflow run nf-core/nascent -profile test,<docker/singularity> --outdir <OUTDIR>

----------------------------------------------------------------------------------------
*/

params {
config_profile_name = 'GROcap PINTS Test profile'
config_profile_description = 'Test dataset to check PINTS pipeline function(https://pints.yulab.org/tre_calling#part-iii-case-1)'

// Input data
input = "${projectDir}/tests/samplesheets/grocap.csv"

genome = 'hg38'
assay_type = 'GROcap'
filter_bed = "https://pints.yulab.org/ref/examples/promoters_1kb_tss_centered.bed.gz"
}
Loading
0