diff --git a/AUTHORS b/AUTHORS.md similarity index 100% rename from AUTHORS rename to AUTHORS.md diff --git a/CHANGELOG.md b/CHANGELOG.md index bb30b98..86c62ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ Changelog ================ -## 0.3 (3/2014) +## 0.31 (3/17/2015) + * Downgraded VCF format from 4.2 to 4.1 + * Fixed a bug that omitted CALLERS_REPORTED_LIST summary tag + * Simplified summary tags; removed dependency on numpy + * Adjusted VarScan translation to accept a file pattern to identify high-confidence files + + +## 0.3 (3/9/2015) * Replaced [normalize], [tag] commands with [translate]; relaxed constraints on incoming data. * Renamed [consensus] to [summarize] * More consistent behavior in [expand] diff --git a/TODO.md b/TODO.md index cde8881..701fbf8 100644 --- a/TODO.md +++ b/TODO.md @@ -8,6 +8,7 @@ TODO * Extend [expand] to parse SnpEff/Annovar annotated results * Extend [expand] to generate formatted results * Improve command validation (check source tags, check "shape" of inputs) +* Enable 4.2 VCF support * Add support for new somatic callers * Add support for Germline workflows * Add support for Python 3 diff --git a/jacquard/__init__.py b/jacquard/__init__.py index 78bd334..d6102f4 100644 --- a/jacquard/__init__.py +++ b/jacquard/__init__.py @@ -1 +1 @@ -__version__ = 0.3 +__version__ = 0.31 diff --git a/jacquard/filter_hc_somatic.py b/jacquard/filter_hc_somatic.py index 19a1e88..82b61b0 100644 --- a/jacquard/filter_hc_somatic.py +++ b/jacquard/filter_hc_somatic.py @@ -57,7 +57,7 @@ def _find_somatic_positions(in_files): total_number_of_files) somatic = 0 vcf_reader = vcf.VcfReader(vcf.FileReader(input_file)) - #TODO: (jebene) - this is old. have this use claim() instead of get_caller() + #TODO: (jebene) - this is old. have this use claim() instead caller = variant_caller_factory.get_caller(vcf_reader.metaheaders, vcf_reader.column_header, vcf_reader.file_name) diff --git a/jacquard/variant_callers/common_tags.py b/jacquard/variant_callers/common_tags.py index a1e804d..4bcf4ed 100644 --- a/jacquard/variant_callers/common_tags.py +++ b/jacquard/variant_callers/common_tags.py @@ -43,7 +43,7 @@ def __init__(self, tag_name): 'Number=1,Type=Integer,' 'Description="1 = variant FILTER is PASS in ' 'original VCF">').format(self.tag_name, - CALLER_PASSED_TAG) + CALLER_PASSED_TAG) def add_tag_values(self, vcf_record): sample_values = {} diff --git a/jacquard/variant_callers/summarize_caller.py b/jacquard/variant_callers/summarize_caller.py index 98f1e38..cccae58 100644 --- a/jacquard/variant_callers/summarize_caller.py +++ b/jacquard/variant_callers/summarize_caller.py @@ -9,7 +9,6 @@ import jacquard.variant_callers.common_tags as common_tags import re -#TODO: (cgates): Numpy is not necessary and frankly not pulling its weight. JQ_SUMMARY_TAG = "JQ_SUMMARY_" JQ_REPORTED = "CALLERS_REPORTED_COUNT" JQ_REPORTED_LIST = "CALLERS_REPORTED_LIST" @@ -255,7 +254,7 @@ def add_tag_values(record): sample, _AlleleFreqRangeTag._PATTERN) - aggregated_values= "." + aggregated_values = "." if tag_values: aggregated_values = _aggregate_numeric_values(tag_values, _range) @@ -297,7 +296,7 @@ def add_tag_values(record): sample, _AlleleFreqAverageTag._PATTERN) - aggregated_values= "." + aggregated_values = "." if tag_values: aggregated_values = _aggregate_numeric_values(tag_values, _average) @@ -339,7 +338,7 @@ def add_tag_values(record): sample, _DepthRangeTag._PATTERN) - aggregated_values= "." + aggregated_values = "." if tag_values: aggregated_values = _aggregate_numeric_values(tag_values, _range) @@ -381,7 +380,7 @@ def add_tag_values(record): sample, _DepthAverageTag._PATTERN) - aggregated_values= "." + aggregated_values = "." if tag_values: aggregated_values = _aggregate_numeric_values(tag_values, _average) @@ -423,7 +422,7 @@ def add_tag_values(record): tag_values = _get_non_null_values(record, sample, _SomaticTag._PATTERN) - aggregated_values= "." + aggregated_values = "." if tag_values: aggregated_values = _aggregate_numeric_values(tag_values, _count) diff --git a/jacquard/variant_callers/varscan.py b/jacquard/variant_callers/varscan.py index 4639d07..7b76139 100644 --- a/jacquard/variant_callers/varscan.py +++ b/jacquard/variant_callers/varscan.py @@ -349,8 +349,8 @@ def claim(self, file_readers): """ (prefix_vcf_readers, - filter_files, - unclaimed_set) = self._find_varscan_files(file_readers) + filter_files, + unclaimed_set) = self._find_varscan_files(file_readers) tuples = self._pair_files(prefix_vcf_readers, filter_files) self._validate_file_pairs(tuples) vcf_readers = self._create_vcf_readers(tuples) diff --git a/setup.py b/setup.py index 799b803..9001fde 100644 --- a/setup.py +++ b/setup.py @@ -23,8 +23,8 @@ def readme(): 'Programming Language :: Python :: 2.7', 'Topic :: Scientific/Engineering :: Bio-Informatics'], keywords='VCF bioinformatic exome-seq DNA-seq variant-call-format', - install_requires=['natsort', 'numpy'], + install_requires=['natsort'], entry_points={'console_scripts': ['jacquard=jacquard.jacquard:main']}, test_suite='nose.collector', - tests_require=['nose', 'testfixtures'], + tests_require=['nose', 'testfixtures', 'numpy'], zip_safe=False) diff --git a/test/functional_tests/01_translate/benchmark/tiny.mutect.translatedTags.vcf b/test/functional_tests/01_translate/benchmark/tiny.mutect.translatedTags.vcf index dfa461f..9957701 100644 --- a/test/functional_tests/01_translate/benchmark/tiny.mutect.translatedTags.vcf +++ b/test/functional_tests/01_translate/benchmark/tiny.mutect.translatedTags.vcf @@ -114,7 +114,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=MuTect -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\jebene\git\Jacquard\test\functional_tests\01_translate\input C:\Users\jebene\Desktop\translate_test --force ##jacquard.cwd=C:\Users\jebene\git ##FILTER= diff --git a/test/functional_tests/01_translate/benchmark/tiny.strelka.indels.translatedTags.vcf b/test/functional_tests/01_translate/benchmark/tiny.strelka.indels.translatedTags.vcf index 1dcf828..f6e1ad1 100644 --- a/test/functional_tests/01_translate/benchmark/tiny.strelka.indels.translatedTags.vcf +++ b/test/functional_tests/01_translate/benchmark/tiny.strelka.indels.translatedTags.vcf @@ -63,7 +63,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=Strelka -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\jebene\git\Jacquard\test\functional_tests\01_translate\input C:\Users\jebene\Desktop\translate_test --force ##jacquard.cwd=C:\Users\jebene\git ##FILTER= diff --git a/test/functional_tests/01_translate/benchmark/tiny.strelka.snvs.translatedTags.vcf b/test/functional_tests/01_translate/benchmark/tiny.strelka.snvs.translatedTags.vcf index c935fb4..34d05a3 100644 --- a/test/functional_tests/01_translate/benchmark/tiny.strelka.snvs.translatedTags.vcf +++ b/test/functional_tests/01_translate/benchmark/tiny.strelka.snvs.translatedTags.vcf @@ -56,7 +56,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=Strelka -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\jebene\git\Jacquard\test\functional_tests\01_translate\input C:\Users\jebene\Desktop\translate_test --force ##jacquard.cwd=C:\Users\jebene\git ##FILTER= diff --git a/test/functional_tests/01_translate/benchmark/tiny.varscan.indel.translatedTags.vcf b/test/functional_tests/01_translate/benchmark/tiny.varscan.indel.translatedTags.vcf index c0f2068..35da97e 100644 --- a/test/functional_tests/01_translate/benchmark/tiny.varscan.indel.translatedTags.vcf +++ b/test/functional_tests/01_translate/benchmark/tiny.varscan.indel.translatedTags.vcf @@ -22,7 +22,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=VarScan -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\jebene\git\Jacquard\test\functional_tests\01_translate\input C:\Users\jebene\Desktop\translate_test --force ##jacquard.cwd=C:\Users\jebene\git ##FILTER= diff --git a/test/functional_tests/01_translate/benchmark/tiny.varscan.snp.translatedTags.vcf b/test/functional_tests/01_translate/benchmark/tiny.varscan.snp.translatedTags.vcf index 0f1a7fe..585ce4d 100644 --- a/test/functional_tests/01_translate/benchmark/tiny.varscan.snp.translatedTags.vcf +++ b/test/functional_tests/01_translate/benchmark/tiny.varscan.snp.translatedTags.vcf @@ -22,7 +22,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=VarScan -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\jebene\git\Jacquard\test\functional_tests\01_translate\input C:\Users\jebene\Desktop\translate_test --force ##jacquard.cwd=C:\Users\jebene\git ##FILTER= diff --git a/test/functional_tests/02_tag/benchmark/tiny_strelka.normalized.jacquardTags.vcf b/test/functional_tests/02_tag/benchmark/tiny_strelka.normalized.jacquardTags.vcf index 1109ec5..f7c0c00 100644 --- a/test/functional_tests/02_tag/benchmark/tiny_strelka.normalized.jacquardTags.vcf +++ b/test/functional_tests/02_tag/benchmark/tiny_strelka.normalized.jacquardTags.vcf @@ -75,7 +75,7 @@ ##source=strelka ##source_version=2.0.15 ##startTime=Wed Jul 9 13:37:22 2014 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=tag C:\Users\jebene\Desktop\tests\tag_input C:\Users\jebene\Desktop\tests\tag_output --force ##jacquard.cwd=C:\Users\jebene\git ##jacquard.tag.caller=Strelka diff --git a/test/functional_tests/03_filter_hc_somatic/benchmark/tiny_strelka.normalized.jacquardTags.HCsomatic.vcf b/test/functional_tests/03_filter_hc_somatic/benchmark/tiny_strelka.normalized.jacquardTags.HCsomatic.vcf index 5aa9ab4..fb05994 100644 --- a/test/functional_tests/03_filter_hc_somatic/benchmark/tiny_strelka.normalized.jacquardTags.HCsomatic.vcf +++ b/test/functional_tests/03_filter_hc_somatic/benchmark/tiny_strelka.normalized.jacquardTags.HCsomatic.vcf @@ -75,7 +75,7 @@ ##source=strelka ##source_version=2.0.15 ##startTime=Wed Jul 9 13:37:22 2014 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=tag C:\Users\jebene\git\Jacquard\test\functional_tests\02_tag\input C:\Users\jebene\git\Jacquard\test\functional_tests\02_tag\output ##jacquard.cwd=C:\Users\jebene\git ##jacquard.tag.caller=Strelka @@ -83,7 +83,7 @@ ##FORMAT= ##FORMAT= ##jacquard.filterHCSomatic.excluded_variants=35 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\03_filter_hc_somatic\input C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\03_filter_hc_somatic\benchmark ##jacquard.cwd=C:\Users\kmeng ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=10 diff --git a/test/functional_tests/03_filter_hc_somatic/input/tiny_strelka.normalized.jacquardTags.vcf b/test/functional_tests/03_filter_hc_somatic/input/tiny_strelka.normalized.jacquardTags.vcf index cdb2e9f..22c9f9b 100644 --- a/test/functional_tests/03_filter_hc_somatic/input/tiny_strelka.normalized.jacquardTags.vcf +++ b/test/functional_tests/03_filter_hc_somatic/input/tiny_strelka.normalized.jacquardTags.vcf @@ -75,7 +75,7 @@ ##source=strelka ##source_version=2.0.15 ##startTime=Wed Jul 9 13:37:22 2014 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=tag C:\Users\jebene\git\Jacquard\test\functional_tests\02_tag\input C:\Users\jebene\git\Jacquard\test\functional_tests\02_tag\output ##jacquard.cwd=C:\Users\jebene\git ##jacquard.tag.caller=Strelka diff --git a/test/functional_tests/04_merge/benchmark/merged.vcf b/test/functional_tests/04_merge/benchmark/merged.vcf index bf4c99e..3207429 100644 --- a/test/functional_tests/04_merge/benchmark/merged.vcf +++ b/test/functional_tests/04_merge/benchmark/merged.vcf @@ -1,5 +1,5 @@ ##fileformat=VCFv4.1 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=merge2 C:\\Users\\jebene\\git\\Jacquard\\test\\functional_tests\\04_merge2\\input c:\\users\\jebene\\appdata\\local\\temp\\tmpsxyixy\\merged.vcf --force ##jacquard.cwd=C:\\Users\\jebene\\git ##jacquard.merge.sample= diff --git a/test/functional_tests/04_merge/input/tiny.mutect.normalized.jacquardTags.HCsomatic.vcf b/test/functional_tests/04_merge/input/tiny.mutect.normalized.jacquardTags.HCsomatic.vcf index 4f76cf9..b7f2137 100644 --- a/test/functional_tests/04_merge/input/tiny.mutect.normalized.jacquardTags.HCsomatic.vcf +++ b/test/functional_tests/04_merge/input/tiny.mutect.normalized.jacquardTags.HCsomatic.vcf @@ -108,7 +108,7 @@ ##contig= ##contig= ##reference=file:ucsc.hg19.fasta -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=tag c:\\users\\jebene\\appdata\\local\\temp\\tmptivahf\\normalize c:\\users\\jebene\\appdata\\local\\temp\\tmptivahf\\tag --force ##jacquard.cwd=C:\\Users\\jebene\\git ##jacquard.tag.caller=MuTect @@ -116,7 +116,7 @@ ##FORMAT= ##FORMAT= ##jacquard.filterHCSomatic.excluded_variants=37 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic c:\\users\\jebene\\appdata\\local\\temp\\tmptivahf\\tag c:\\users\\jebene\\appdata\\local\\temp\\tmptivahf\\filter_hc_somatic --force ##jacquard.cwd=C:\\Users\\jebene\\git ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=12 diff --git a/test/functional_tests/04_merge/input/tiny.strelka.normalized.jacquardTags.HCsomatic.vcf b/test/functional_tests/04_merge/input/tiny.strelka.normalized.jacquardTags.HCsomatic.vcf index 0ea6cff..fcbee43 100644 --- a/test/functional_tests/04_merge/input/tiny.strelka.normalized.jacquardTags.HCsomatic.vcf +++ b/test/functional_tests/04_merge/input/tiny.strelka.normalized.jacquardTags.HCsomatic.vcf @@ -75,7 +75,7 @@ ##source=strelka ##source_version=2.0.15 ##startTime=Wed Jul 9 13:37:22 2014 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=tag c:\\users\\jebene\\appdata\\local\\temp\\tmpfyxdri\\normalize c:\\users\\jebene\\appdata\\local\\temp\\tmpfyxdri\\tag --force ##jacquard.cwd=C:\\Users\\jebene\\git ##jacquard.tag.caller=Strelka @@ -85,7 +85,7 @@ ##FILTER= ##FILTER= ##jacquard.filterHCSomatic.excluded_variants=33 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic c:\\users\\jebene\\appdata\\local\\temp\\tmpfyxdri\\tag c:\\users\\jebene\\appdata\\local\\temp\\tmpfyxdri\\filter_hc_somatic --force ##jacquard.cwd=C:\\Users\\jebene\\git ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=12 diff --git a/test/functional_tests/04_merge/input/tiny.varscan.normalized.jacquardTags.HCsomatic.vcf b/test/functional_tests/04_merge/input/tiny.varscan.normalized.jacquardTags.HCsomatic.vcf index 37d18b2..0f3ec39 100644 --- a/test/functional_tests/04_merge/input/tiny.varscan.normalized.jacquardTags.HCsomatic.vcf +++ b/test/functional_tests/04_merge/input/tiny.varscan.normalized.jacquardTags.HCsomatic.vcf @@ -16,7 +16,7 @@ ##INFO= ##fileformat=VCFv4.1 ##source=VarScan2 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=tag c:\\users\\jebene\\appdata\\local\\temp\\tmpfuwrpl\\normalize c:\\users\\jebene\\appdata\\local\\temp\\tmpfuwrpl\\tag --force ##jacquard.cwd=C:\\Users\\jebene\\git ##jacquard.tag.caller=VarScan @@ -24,7 +24,7 @@ ##FORMAT= ##FORMAT= ##jacquard.filterHCSomatic.excluded_variants=43 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic c:\\users\\jebene\\appdata\\local\\temp\\tmpfuwrpl\\tag c:\\users\\jebene\\appdata\\local\\temp\\tmpfuwrpl\\filter_hc_somatic --force ##jacquard.cwd=C:\\Users\\jebene\\git ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=12 diff --git a/test/functional_tests/05_summarize/benchmark/summarized.vcf b/test/functional_tests/05_summarize/benchmark/summarized.vcf index 4a37e97..f94085c 100644 --- a/test/functional_tests/05_summarize/benchmark/summarized.vcf +++ b/test/functional_tests/05_summarize/benchmark/summarized.vcf @@ -1,4 +1,4 @@ -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=summarize C:\Users\jebene\git\Jacquard\test\functional_tests\05_summarize\input\tiny_strelka.merged.vcf C:\Users\jebene\Desktop\summarized\summarized.vcf --force ##jacquard.cwd=C:\Users\jebene\git ##FORMAT= @@ -12,7 +12,7 @@ ##FORMAT= ##FORMAT= ##FORMAT= -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=merge C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\04_merge\input C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\04_merge\output\tiny_strelka.merged.vcf ##jacquard.cwd=C:\Users\kmeng ##FORMAT= diff --git a/test/functional_tests/05_summarize/input/tiny_strelka.merged.vcf b/test/functional_tests/05_summarize/input/tiny_strelka.merged.vcf index 166211d..aaac82f 100644 --- a/test/functional_tests/05_summarize/input/tiny_strelka.merged.vcf +++ b/test/functional_tests/05_summarize/input/tiny_strelka.merged.vcf @@ -1,4 +1,4 @@ -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=merge C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\04_merge\input C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\04_merge\output\tiny_strelka.merged.vcf ##jacquard.cwd=C:\Users\kmeng ##FORMAT= diff --git a/test/functional_tests/06_expand/input/summarized.vcf b/test/functional_tests/06_expand/input/summarized.vcf index bc30277..ca2f5df 100644 --- a/test/functional_tests/06_expand/input/summarized.vcf +++ b/test/functional_tests/06_expand/input/summarized.vcf @@ -217,7 +217,7 @@ ##jacquard.merge.file2=tiny_strelka.normalized.jacquardTags.HCsomatic.splitMultAlts.vcf(['NORMAL', 'TUMOR']) ##jacquard.merge.sample_column1=Strelka|tiny_strelka|NORMAL(tiny_strelka.normalized.jacquardTags.HCsomatic.splitMultAlts.vcf) ##jacquard.merge.sample_column2=Strelka|tiny_strelka|TUMOR(tiny_strelka.normalized.jacquardTags.HCsomatic.splitMultAlts.vcf) -##jacquard.version=0.3 +##jacquard.version=X ##samtoolsVersion=0.1.17 (r973:277) #CHROM POS ID REF ALT QUAL FILTER INFO FORMAT tiny_strelka|NORMAL tiny_strelka|TUMOR chr1 1147545 . A G . . POPULATION_SNPFreq=Novel_locus;POPULATION_AF_CATEGORY=Novel_locus;POPULATION_AF=.;POPULATION_AF_SOURCE=.;NUCMATCH=0;in_.;SNP;VARTYPE=SNP;dbNSFP_rollup_tolerated=0;dbNSFP_rollup_damaging=0;dbNSFP_rollup_total=0;FS=GTGTGCTTCCCAGCCAAGGTGCAGCTGTTGGGGAACAGGAGGTGTTGCTC[A/G]GGCCAGAAACCCCCTGGGACCCGGGAGATGCGGTGGGGATAACAGGGTCC;SNPEFF_TOP_EFF=.;SNPEFF_TOP_EFF_FOR_GENES=.;SNPEFF_TOP_EFFECT_GENE_REGION=.;SNPEFF_TOP_EFFECT_IMPACT=.;SNPEFF_TOP_EFFECT_IMPACT_RANK=.;SNPEFF_ALL_GENE_SYMBOLS=TNFRSF4;SNPEFF_TOP_EFFECT_GENE_ID=.;SNPEFF_TOP_EFFECT_GENE_SYMBOL=.;SNPEFF_TOP_EFFECT_TRANSCRIPT_BIOTYPE=.;SNPEFF_TOP_EFFECT_AA_LENGTH=.;SNPEFF_TOP_EFFECT_TRANSCRIPT_ID=.;SNPEFF_TOP_EFFECT_AA_CHANGE=.;SNPEFF_TOP_EFFECT_EFFECT=.;EFF=sequence_feature[glycosylation_site:N-linked__GlcNAc..._](MODERATE|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|5|1),sequence_feature[glycosylation_site:N-linked__GlcNAc..._](MODERATE|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|4|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|5|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|2|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|3|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|1|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|4|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|6|1),sequence_feature[repeat:TNFR-Cys_4](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|5|1),sequence_feature[repeat:TNFR-Cys_4](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|4|1),intron_variant(MODIFIER|||c.438-27T>C|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|4|1),intron_variant(MODIFIER|||n.274-27T>C||ENSG00000186827|processed_transcript|CODING|ENST00000453580|3|1),intron_variant(MODIFIER|||n.1018-27T>C||ENSG00000186827|retained_intron|CODING|ENST00000497869|3|1);SNPEFF_WARNING_ERROR=. JQ_SK_AF:JQ_SK_DP:JQ_SK_HC_SOM:JQ_CONS_AF:JQ_CONS_SOM_SUM:JQ_CONS_DP:JQ_CONS_AF_RANGE:JQ_CONS_DP_RANGE:JQ_CONS_AF_RANGE_ZSCORE:JQ_CONS_DP_RANGE_ZSCORE 0.0:27:0:0.0:0:27.0:0.0:0.0:0.0:0.0 0.31:35:1:0.31:1:35.0:0.0:0.0:0.0:0.0 diff --git a/test/functional_tests/06_expand_col_spec/input/summarized.vcf b/test/functional_tests/06_expand_col_spec/input/summarized.vcf index e3d4de4..8aebcec 100644 --- a/test/functional_tests/06_expand_col_spec/input/summarized.vcf +++ b/test/functional_tests/06_expand_col_spec/input/summarized.vcf @@ -217,7 +217,7 @@ ##jacquard.merge.file2=tiny_strelka.normalized.jacquardTags.HCsomatic.splitMultAlts.vcf(['NORMAL', 'TUMOR']) ##jacquard.merge.sample_column1=Strelka|tiny_strelka|NORMAL(tiny_strelka.normalized.jacquardTags.HCsomatic.splitMultAlts.vcf) ##jacquard.merge.sample_column2=Strelka|tiny_strelka|TUMOR(tiny_strelka.normalized.jacquardTags.HCsomatic.splitMultAlts.vcf) -##jacquard.version=0.3 +##jacquard.version=X ##samtoolsVersion=0.1.17 (r973:277) #CHROM POS ID REF ALT QUAL FILTER INFO FORMAT tiny_strelka|NORMAL tiny_strelka|TUMOR chr1 1147545 . A G . . POPULATION_SNPFreq=Novel_locus;POPULATION_AF_CATEGORY=Novel_locus;POPULATION_AF=.;POPULATION_AF_SOURCE=.;NUCMATCH=0;in_.;SNP;VARTYPE=SNP;dbNSFP_rollup_tolerated=0;dbNSFP_rollup_damaging=0;dbNSFP_rollup_total=0;FS=GTGTGCTTCCCAGCCAAGGTGCAGCTGTTGGGGAACAGGAGGTGTTGCTC[A/G]GGCCAGAAACCCCCTGGGACCCGGGAGATGCGGTGGGGATAACAGGGTCC;SNPEFF_TOP_EFF=.;SNPEFF_TOP_EFF_FOR_GENES=.;SNPEFF_TOP_EFFECT_GENE_REGION=.;SNPEFF_TOP_EFFECT_IMPACT=.;SNPEFF_TOP_EFFECT_IMPACT_RANK=.;SNPEFF_ALL_GENE_SYMBOLS=TNFRSF4;SNPEFF_TOP_EFFECT_GENE_ID=.;SNPEFF_TOP_EFFECT_GENE_SYMBOL=.;SNPEFF_TOP_EFFECT_TRANSCRIPT_BIOTYPE=.;SNPEFF_TOP_EFFECT_AA_LENGTH=.;SNPEFF_TOP_EFFECT_TRANSCRIPT_ID=.;SNPEFF_TOP_EFFECT_AA_CHANGE=.;SNPEFF_TOP_EFFECT_EFFECT=.;EFF=sequence_feature[glycosylation_site:N-linked__GlcNAc..._](MODERATE|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|5|1),sequence_feature[glycosylation_site:N-linked__GlcNAc..._](MODERATE|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|4|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|5|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|2|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|3|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|1|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|4|1),sequence_feature[topological_domain:Extracellular](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|6|1),sequence_feature[repeat:TNFR-Cys_4](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|5|1),sequence_feature[repeat:TNFR-Cys_4](LOW|||c.438A>G|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|4|1),intron_variant(MODIFIER|||c.438-27T>C|277|ENSG00000186827|protein_coding|CODING|ENST00000379236|4|1),intron_variant(MODIFIER|||n.274-27T>C||ENSG00000186827|processed_transcript|CODING|ENST00000453580|3|1),intron_variant(MODIFIER|||n.1018-27T>C||ENSG00000186827|retained_intron|CODING|ENST00000497869|3|1);SNPEFF_WARNING_ERROR=. JQ_SK_AF:JQ_SK_DP:JQ_SK_HC_SOM:JQ_SUMMARY_AF:JQ_SUMMARY_SOM_SUM:JQ_SUMMARY_DP:JQ_SUMMARY_AF_RANGE:JQ_SUMMARY_DP_RANGE:JQ_SUMMARY_AF_RANGE_ZSCORE:JQ_SUMMARY_DP_RANGE_ZSCORE 0.0:27:0:0.0:0:27.0:0.0:0.0:0.0:0.0 0.31:35:1:0.31:1:35.0:0.0:0.0:0.0:0.0 diff --git a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.mutect.translatedTags.HCsomatic.vcf b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.mutect.translatedTags.HCsomatic.vcf index aa8b188..897e3a9 100644 --- a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.mutect.translatedTags.HCsomatic.vcf +++ b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.mutect.translatedTags.HCsomatic.vcf @@ -114,14 +114,14 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=MuTect -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= ##FILTER= ##FILTER= ##jacquard.filterHCSomatic.excluded_variants=37 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\filter_hc_somatic\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=13 diff --git a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.strelka.indels.translatedTags.HCsomatic.vcf b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.strelka.indels.translatedTags.HCsomatic.vcf index 6a1b140..638d827 100644 --- a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.strelka.indels.translatedTags.HCsomatic.vcf +++ b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.strelka.indels.translatedTags.HCsomatic.vcf @@ -63,14 +63,14 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=Strelka -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= ##FILTER= ##FILTER= ##jacquard.filterHCSomatic.excluded_variants=18 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\filter_hc_somatic\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=13 diff --git a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.strelka.snvs.translatedTags.HCsomatic.vcf b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.strelka.snvs.translatedTags.HCsomatic.vcf index da7a34d..76aa6a0 100644 --- a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.strelka.snvs.translatedTags.HCsomatic.vcf +++ b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.strelka.snvs.translatedTags.HCsomatic.vcf @@ -56,14 +56,14 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=Strelka -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= ##FILTER= ##FILTER= ##jacquard.filterHCSomatic.excluded_variants=15 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\filter_hc_somatic\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=13 diff --git a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.varscan.indel.translatedTags.HCsomatic.vcf b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.varscan.indel.translatedTags.HCsomatic.vcf index d18f3c2..dc85faf 100644 --- a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.varscan.indel.translatedTags.HCsomatic.vcf +++ b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.varscan.indel.translatedTags.HCsomatic.vcf @@ -22,14 +22,14 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=VarScan -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= ##FILTER= ##FILTER= ##jacquard.filterHCSomatic.excluded_variants=22 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\filter_hc_somatic\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=13 diff --git a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.varscan.snp.translatedTags.HCsomatic.vcf b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.varscan.snp.translatedTags.HCsomatic.vcf index 538b116..2423a92 100644 --- a/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.varscan.snp.translatedTags.HCsomatic.vcf +++ b/test/functional_tests/jacquard_test/filter_hc_somatic/benchmark/tiny.varscan.snp.translatedTags.HCsomatic.vcf @@ -22,14 +22,14 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=VarScan -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= ##FILTER= ##FILTER= ##jacquard.filterHCSomatic.excluded_variants=21 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=filter_hc_somatic C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\filter_hc_somatic\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##jacquard.filterHCSomatic.total_highConfidence_somatic_positions=13 diff --git a/test/functional_tests/jacquard_test/merge/benchmark/merged.vcf b/test/functional_tests/jacquard_test/merge/benchmark/merged.vcf index 14647da..bf47077 100644 --- a/test/functional_tests/jacquard_test/merge/benchmark/merged.vcf +++ b/test/functional_tests/jacquard_test/merge/benchmark/merged.vcf @@ -1,5 +1,5 @@ ##fileformat=VCFv4.1 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=merge C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\filter_hc_somatic\benchmark C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\merge\benchmark\merged.vcf ##jacquard.cwd=C:\Users\kmeng ##jacquard.merge.sample= diff --git a/test/functional_tests/jacquard_test/summarize/benchmark/summarized.vcf b/test/functional_tests/jacquard_test/summarize/benchmark/summarized.vcf index f39ff0d..7dc3a22 100644 --- a/test/functional_tests/jacquard_test/summarize/benchmark/summarized.vcf +++ b/test/functional_tests/jacquard_test/summarize/benchmark/summarized.vcf @@ -1,4 +1,4 @@ -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=summarize C:\Users\jebene\git\jacquard\test\functional_tests\jacquard_test\merge\benchmark\merged.vcf C:\Users\jebene\Desktop\jacquard_test\summarized\summarized.vcf --force ##jacquard.cwd=C:\Users\jebene\git ##FORMAT= @@ -13,7 +13,7 @@ ##FORMAT= ##FORMAT= ##fileformat=VCFv4.1 -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=merge C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\filter_hc_somatic\benchmark C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\merge\benchmark\merged.vcf ##jacquard.cwd=C:\Users\kmeng ##jacquard.merge.sample= diff --git a/test/functional_tests/jacquard_test/translate/benchmark/tiny.mutect.translatedTags.vcf b/test/functional_tests/jacquard_test/translate/benchmark/tiny.mutect.translatedTags.vcf index e8b1b7b..8852d40 100644 --- a/test/functional_tests/jacquard_test/translate/benchmark/tiny.mutect.translatedTags.vcf +++ b/test/functional_tests/jacquard_test/translate/benchmark/tiny.mutect.translatedTags.vcf @@ -114,7 +114,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=MuTect -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= diff --git a/test/functional_tests/jacquard_test/translate/benchmark/tiny.strelka.indels.translatedTags.vcf b/test/functional_tests/jacquard_test/translate/benchmark/tiny.strelka.indels.translatedTags.vcf index 6428b5c..e1cc0e4 100644 --- a/test/functional_tests/jacquard_test/translate/benchmark/tiny.strelka.indels.translatedTags.vcf +++ b/test/functional_tests/jacquard_test/translate/benchmark/tiny.strelka.indels.translatedTags.vcf @@ -63,7 +63,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=Strelka -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= diff --git a/test/functional_tests/jacquard_test/translate/benchmark/tiny.strelka.snvs.translatedTags.vcf b/test/functional_tests/jacquard_test/translate/benchmark/tiny.strelka.snvs.translatedTags.vcf index c70cf88..7d92f2f 100644 --- a/test/functional_tests/jacquard_test/translate/benchmark/tiny.strelka.snvs.translatedTags.vcf +++ b/test/functional_tests/jacquard_test/translate/benchmark/tiny.strelka.snvs.translatedTags.vcf @@ -56,7 +56,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=Strelka -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= diff --git a/test/functional_tests/jacquard_test/translate/benchmark/tiny.varscan.indel.translatedTags.vcf b/test/functional_tests/jacquard_test/translate/benchmark/tiny.varscan.indel.translatedTags.vcf index c7aaadc..67e1fc0 100644 --- a/test/functional_tests/jacquard_test/translate/benchmark/tiny.varscan.indel.translatedTags.vcf +++ b/test/functional_tests/jacquard_test/translate/benchmark/tiny.varscan.indel.translatedTags.vcf @@ -22,7 +22,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=VarScan -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= diff --git a/test/functional_tests/jacquard_test/translate/benchmark/tiny.varscan.snp.translatedTags.vcf b/test/functional_tests/jacquard_test/translate/benchmark/tiny.varscan.snp.translatedTags.vcf index e382783..071f99a 100644 --- a/test/functional_tests/jacquard_test/translate/benchmark/tiny.varscan.snp.translatedTags.vcf +++ b/test/functional_tests/jacquard_test/translate/benchmark/tiny.varscan.snp.translatedTags.vcf @@ -22,7 +22,7 @@ ##FORMAT= ##FORMAT= ##jacquard.translate.caller=VarScan -##jacquard.version=0.3 +##jacquard.version=X ##jacquard.command=translate C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\input\ C:\Users\kmeng\ExomeSeqPipeline\test\functional_tests\jacquard_test\translate\benchmark --force ##jacquard.cwd=C:\Users\kmeng ##FILTER= diff --git a/test/jacquard_test.py b/test/jacquard_test.py index d23b2de..baf6501 100644 --- a/test/jacquard_test.py +++ b/test/jacquard_test.py @@ -51,6 +51,9 @@ def test_error_raisesTransformedMessage(self): class JacquardTestCase(test_case.JacquardBaseTestCase): + def test_version(self): + self.assertEquals(0.31, jacquard.__version__) + def test_set_interrupt_handler(self): mock_signal_dispatcher = MockSignalDispatcher() @@ -73,8 +76,8 @@ def test_gracefulErrorMessageWhenUnanticipatedProblem(self): with self.assertRaises(SystemExit) as exit_code: jacquard._dispatch([mock_module], ["mock_module", - input_dir.path, - output_dir.path]) + input_dir.path, + output_dir.path]) self.assertEqual(1, exit_code.exception.code) actual_messages = self.output.getvalue().rstrip().split("\n") @@ -145,8 +148,8 @@ def test_dispatch(self): with TempDirectory() as input_dir, TempDirectory() as output_dir: mock_module.my_exception_string = "" jacquard._dispatch([mock_module], ["mock_module", - input_dir.path, - output_dir.path]) + input_dir.path, + output_dir.path]) self.assertTrue(mock_module.execute_called) self.assertTrue(mock_module.report_called) self.assertTrue(MOCK_MOVE_TEMP_CONTENTS_CALLED) @@ -156,8 +159,8 @@ def test_dispatch_unknownCommand(self): mock_module.my_exception_string = "" with self.assertRaises(SystemExit) as exit_code: jacquard._dispatch([mock_module], ["foo_command", - input_dir.path, - output_dir.path]) + input_dir.path, + output_dir.path]) self.assertEquals(1, exit_code.exception.code) self.assertRegexpMatches(self.output.getvalue(), r"'foo_command' is not a Jacquard command; choose from 'mock_module'") @@ -171,8 +174,8 @@ def test_dispatch_nonEmptyOutputDir(self): mock_module.predicted_output = set(["file1.vcf"]) with self.assertRaises(SystemExit) as exit_code: jacquard._dispatch([mock_module], ["mock_module", - input_dir.path, - output_file]) + input_dir.path, + output_file]) self.assertEqual(1, exit_code.exception.code) @@ -182,9 +185,9 @@ def test_dispatch_forceNonEmptyOutputDir(self): mock_module.my_exception_string = "" jacquard._dispatch([mock_module], ["mock_module", - input_dir.path, - output_dir.path, - "--force"]) + input_dir.path, + output_dir.path, + "--force"]) self.assertTrue(1 == 1, "Force does not result in premature exit.") @@ -192,8 +195,8 @@ def test_dispatch_done(self): with TempDirectory() as input_dir, TempDirectory() as output_dir: mock_module.my_exception_string = "" jacquard._dispatch([mock_module], ["mock_module", - input_dir.path, - output_dir.path]) + input_dir.path, + output_dir.path]) actual_messages = self.output.getvalue().rstrip().split("\n") self.assertRegexpMatches(actual_messages[-1], "Done") @@ -202,8 +205,8 @@ def test_dispatch_doneWithWarnings(self): mock_module.my_exception_string = "" logger.WARNING_OCCURRED = True jacquard._dispatch([mock_module], ["mock_module", - input_dir.path, - output_dir.path]) + input_dir.path, + output_dir.path]) actual_messages = self.output.getvalue().rstrip().split("\n") self.assertRegexpMatches(actual_messages[-1], r"Done. \(See warnings above\)") logger.WARNING_OCCURRED = False diff --git a/test/test_case.py b/test/test_case.py index 2899d5a..c378efa 100644 --- a/test/test_case.py +++ b/test/test_case.py @@ -60,6 +60,8 @@ def _compare_files(self, output, output_file, expected_dir): self.assertStartsWith(actual[i], "##jacquard.cwd=") elif expected[i].startswith("##jacquard.command="): self.assertStartsWith(actual[i], "##jacquard.command=") + elif expected[i].startswith("##jacquard.version="): + self.assertStartsWith(actual[i], "##jacquard.version=") else: self.assertEquals(expected[i].rstrip(), actual[i].rstrip()) diff --git a/test/translate_test.py b/test/translate_test.py index dd1e3f0..5cb6547 100644 --- a/test/translate_test.py +++ b/test/translate_test.py @@ -233,9 +233,9 @@ def test_translate_write_metaheaders_addsExecutionMetaheaders(self): def test_store_hc_file(self): with TempDirectory() as temp_dir: args = Namespace(input=temp_dir.path, - output=temp_dir.path, - force=True, - varscan_hc_filter_filename="pass$") + output=temp_dir.path, + force=True, + varscan_hc_filter_filename="pass$") translate._store_hc_file(args) self.assertEquals("pass$", variant_caller_factory._CALLERS[0].hc_file_pattern) diff --git a/test/variant_callers/summarize_caller_test.py b/test/variant_callers/summarize_caller_test.py index c01cd6e..d4838de 100644 --- a/test/variant_callers/summarize_caller_test.py +++ b/test/variant_callers/summarize_caller_test.py @@ -659,7 +659,7 @@ def test_get_new_metaheaders(self): 'Type=Integer,' 'Description="Count of variant callers which listed this variant in the Jacquard tagged VCF">')\ .format(summarize_caller.JQ_SUMMARY_TAG, - summarize_caller.JQ_REPORTED) + summarize_caller.JQ_REPORTED) actual = summarize_caller.SummarizeCaller().get_metaheaders() diff --git a/test/variant_callers/varscan_test.py b/test/variant_callers/varscan_test.py index 799606a..7153b0f 100644 --- a/test/variant_callers/varscan_test.py +++ b/test/variant_callers/varscan_test.py @@ -178,7 +178,7 @@ def test_claim_multiplePatients(self): self.assertIn("_HCTag", self._get_tag_class_names(vcf_readers[0])) self.assertIn("_HCTag", - self._get_tag_class_names(vcf_readers[1])) + self._get_tag_class_names(vcf_readers[1])) self.assertEquals(reader1.file_name, vcf_readers[0]._vcf_reader.file_name) def test_claim_varscanVcfOnly(self):