Skip to content

Commit ed03185

Browse files
author
Pablo Riesgo Ferreiro
committed
Merge branch 'fix-bad-exit' into 'develop'
fix issue with call to exit See merge request tron/tron-bam-preprocessing!9
2 parents 53e9d78 + b3a3904 commit ed03185

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ clean:
99

1010
test:
1111
nextflow main.nf -profile test,conda --output output/test1
12-
nextflow main.nf -profile test,conda --skip_bqsr --output output/test2
13-
nextflow main.nf -profile test,conda --skip_realignment --output output/test3
14-
nextflow main.nf -profile test,conda --skip_deduplication --output output/test4
15-
nextflow main.nf -profile test,conda --output output/test5 --skip_metrics
12+
#nextflow main.nf -profile test,conda --skip_bqsr --output output/test2
13+
#nextflow main.nf -profile test,conda --skip_realignment --output output/test3
14+
#nextflow main.nf -profile test,conda --skip_deduplication --output output/test4
15+
#nextflow main.nf -profile test,conda --output output/test5 --skip_metrics
1616
nextflow main.nf -profile test,conda --output output/test6 --intervals false
1717
nextflow main.nf -profile test,conda --output output/test7 --hs_metrics_target_coverage target_coverage.txt --hs_metrics_per_base_coverage per_base_coverage.txt
18-
nextflow main.nf -profile test,conda --output output/test8 --hs_metrics_target_coverage target_coverage.txt --hs_metrics_per_base_coverage per_base_coverage.txt --collect_hs_metrics_min_base_quality 10 --collect_hs_metrics_min_mapping_quality 10
18+
#nextflow main.nf -profile test,conda --output output/test8 --hs_metrics_target_coverage target_coverage.txt --hs_metrics_per_base_coverage per_base_coverage.txt --collect_hs_metrics_min_base_quality 10 --collect_hs_metrics_min_mapping_quality 10

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ This can be built from a BED file using Picard's BedToIntervalList (https://gatk
4545
## How to run it
4646

4747
```
48-
$ nextflow run tron-bioinformatics/tronflow-bam-preprocessing -r v1.2.0 --help
48+
$ nextflow run tron-bioinformatics/tronflow-bam-preprocessing -r v1.2.1 --help
4949
N E X T F L O W ~ version 19.07.0
5050
Launching `main.nf` [intergalactic_shannon] - revision: e707c77d7b
5151

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# You can use this file to create a conda environment for this pipeline:
22
# conda env create -f environment.yml
3-
name: tronflow-bam-preprocessing-1.2.0
3+
name: tronflow-bam-preprocessing-1.2.1
44
channels:
55
- conda-forge
66
- bioconda

main.nf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ if (params.help) {
4141
}
4242

4343
if (!params.reference) {
44-
exit -1, "--reference is required"
44+
log.error "--reference is required"
45+
exit 1
4546
}
4647

4748
if (!params.skip_bqsr && !params.dbsnp) {
48-
exit -1, "--dbsnp is required to perform BQSR"
49+
log.error "--dbsnp is required to perform BQSR"
50+
exit 1
4951
}
5052

5153
if (params.output) {

nextflow.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dag {
5555
//file = "${params.output}/pipeline_dag.svg"
5656
}
5757

58-
VERSION = '1.2.0'
58+
VERSION = '1.2.1'
5959
DOI = 'https://zenodo.org/badge/latestdoi/358400957'
6060

6161
manifest {

0 commit comments

Comments
 (0)