Skip to content

Commit 0b4fe32

Browse files
authored
Merge pull request #194 from apeltzer/fix-ref-genomes
Fix ref genomes & other behaviour
2 parents c855906 + 1dd1df4 commit 0b4fe32

6 files changed

Lines changed: 82 additions & 93 deletions

File tree

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ script:
4343
# Run the basic pipeline with the test profile
4444
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --saveReference
4545
# Run the basic pipeline with single end data (pretending its single end actually)
46-
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --singleEnd --bwa_index results/reference_genome/bwa_index/bwa_index/
46+
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --singleEnd --bwa_index results/reference_genome/bwa_index/BWAIndex/Mammoth_MT_Krause.fasta
4747
# Run the basic pipeline with paired end data without collapsing
4848
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --skip_collapse --saveReference
4949
# Run the basic pipeline with paired end data without trimming
@@ -53,13 +53,13 @@ script:
5353
# Run the basic pipeline with output unmapped reads as fastq
5454
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --strip_input_fastq
5555
# Run the same pipeline testing optional step: fastp, complexity
56-
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --complexity_filter --bwa_index results/reference_genome/bwa_index/bwa_index/
56+
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --complexity_filter --bwa_index results/reference_genome/bwa_index/BWAIndex/Mammoth_MT_Krause.fasta
5757
# Test BAM Trimming
58-
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --trim_bam --bwa_index results/reference_genome/bwa_index/bwa_index/
58+
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --trim_bam --bwa_index results/reference_genome/bwa_index/BWAIndex/Mammoth_MT_Krause.fasta
5959
# Test running with CircularMapper
6060
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --circularmapper --circulartarget 'NC_007596.2'
6161
# Test running with BWA Mem
62-
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --bwamem --bwa_index results/reference_genome/bwa_index/bwa_index/
62+
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --bwamem --bwa_index results/reference_genome/bwa_index/BWAIndex/Mammoth_MT_Krause.fasta
6363
# Test with zipped reference input
6464
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker --pairedEnd --fasta 'https://raw.githubusercontent.com/nf-core/test-datasets/eager2/reference/Test.fasta.gz'
6565
# Run the basic pipeline with the bam input profile

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1717
* [#152](https://github.com/nf-core/eager/pull/152) - DamageProfiler errors [won't crash entire pipeline anymore](https://github.com/nf-core/eager/issues/171)
1818
* [#176](https://github.com/nf-core/eager/pull/176) - Increase runtime for DamageProfiler on [large reference genomes](https://github.com/nf-core/eager/issues/173)
1919
* [#172](https://github.com/nf-core/eager/pull/152) - DamageProfiler errors [won't crash entire pipeline anymore](https://github.com/nf-core/eager/issues/171)
20-
* [#174](https://github.com/nf-core/eager/pull/190) - Publish DeDup files [properly](https://github.com/nf-core/eager/issues/183)
20+
* [#174](https://github.com/nf-core/eager/pull/190) - Publish DeDup files [properly](https://github.com/nf-core/eager/issues/183)
21+
* TBF - Fix reference [issues](https://github.com/nf-core/eager/issues/150)
2122

2223
### `Dependencies`
2324

conf/base.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ process {
6767
params.large_ref ? "time = { check_max(8.h * task.attempt, 'time') }" : "time = { check_max(2.h * task.attempt, 'time') }"
6868
}
6969

70-
withName: extract_unmapped_reads {
70+
withName: strip_input_fastq {
7171
cpus = { check_max(8 * task.attempt, 'cpus') }
7272
memory = { check_max( 8.GB * task.attempt, 'memory' ) }
7373
}

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ dependencies:
2929
- bioconda::bamutil=1.0.14
3030
- bioconda::mtnucratio=0.5
3131
- pysam=0.15.2
32-
- python=3.6
32+
- python=3.6.7
3333
#Missing Schmutzi,snpAD

0 commit comments

Comments
 (0)