Skip to content

Commit d6ef725

Browse files
committed
Software scraping fix
1 parent 7fc5867 commit d6ef725

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1919
- General code cleanup and standardisation of parameters with no default setting
2020
- [#750](https://github.com/nf-core/eager/issues/750) - Fixed piped commands requesting the same number of CPUs at each command step
2121
- [#757](https://github.com/nf-core/eager/issues/757) - Removed confusing 'Data Type' variable from MultiQC workflow summary (not consistent with TSV input)
22+
- [#759](https://github.com/nf-core/eager/pull/759) - Fixed malformed software scraping regex that resulted in N/A in MultiQC report
2223

2324
### `Dependencies`
2425

bin/scrape_software_versions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'Bowtie2': ['v_bowtie2.txt', r"bowtie2-([0-9]+\.[0-9]+\.[0-9]+) -fdebug"],
1717
'Qualimap': ['v_qualimap.txt', r"QualiMap v.(\S+)"],
1818
'GATK HaplotypeCaller': ['v_gatk.txt', r" v(\S+)"],
19-
#'GATK UnifiedGenotyper': ['v_gatk3_5.txt', r"version (\S+)"],
19+
'GATK UnifiedGenotyper': ['v_gatk3.txt', r"(\S+)"],
2020
'bamUtil' : ['v_bamutil.txt', r"Version: (\S+);"],
2121
'fastP': ['v_fastp.txt', r"([\d\.]+)"],
2222
'DamageProfiler' : ['v_damageprofiler.txt', r"DamageProfiler v(\S+)"],
@@ -37,7 +37,7 @@
3737
'kraken':['v_kraken.txt', r"Kraken version (\S+)"],
3838
'eigenstrat_snp_coverage':['v_eigenstrat_snp_coverage.txt',r"(\S+)"],
3939
'mapDamage2':['v_mapdamage.txt',r"(\S+)"],
40-
'bbduk':['v_bbduk.txt',r"(\S+)"]
40+
'bbduk':['v_bbduk.txt',r"(.*)"]
4141
}
4242

4343
results = OrderedDict()

main.nf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2939,6 +2939,7 @@ process get_software_versions {
29392939
qualimap --version &> v_qualimap.txt 2>&1 || true
29402940
preseq &> v_preseq.txt 2>&1 || true
29412941
gatk --version 2>&1 | head -n 1 > v_gatk.txt 2>&1 || true
2942+
gatk3 --version 2>&1 > v_gatk3.txt 2>&1 || true
29422943
freebayes --version &> v_freebayes.txt 2>&1 || true
29432944
bedtools --version &> v_bedtools.txt 2>&1 || true
29442945
damageprofiler --version &> v_damageprofiler.txt 2>&1 || true
@@ -2957,7 +2958,7 @@ process get_software_versions {
29572958
pileupCaller --version &> v_sequencetools.txt 2>&1 || true
29582959
bowtie2 --version | grep -a 'bowtie2-.* -fdebug' > v_bowtie2.txt || true
29592960
eigenstrat_snp_coverage --version | cut -d ' ' -f2 >v_eigenstrat_snp_coverage.txt || true
2960-
mapDamage2 --version > v_mapdamage.txt || true
2961+
mapDamage --version > v_mapdamage.txt || true
29612962
bbduk.sh | grep 'Last modified' | cut -d' ' -f 3-99 > v_bbduk.txt || true
29622963
29632964
scrape_software_versions.py &> software_versions_mqc.yaml

0 commit comments

Comments
 (0)