diff --git a/workflow/main.nf b/workflow/main.nf index ca8736febb01b9ecc02a9376db5be290bdcefb95..99474e515cf8d39101044ebdc139f20f308cfb07 100644 --- a/workflow/main.nf +++ b/workflow/main.nf @@ -326,6 +326,8 @@ process crossReads { } else { """ + module load python/3.6.1-2-anaconda + module load phantompeakqualtools/1.2 python3 $baseDir/scripts/xcor.py -t $seTagAlign """ } diff --git a/workflow/tests/test_annotate_peaks.py b/workflow/tests/test_annotate_peaks.py index 3df797b32c9d148a44f3b1e94fcdffd399cb63f8..1342a125db90619ff19838d7cfb5c8c1be7b9d69 100644 --- a/workflow/tests/test_annotate_peaks.py +++ b/workflow/tests/test_annotate_peaks.py @@ -24,7 +24,7 @@ def test_upsetplot_singleend(): def test_annotation_singleend(): annotation_file = test_output_path + 'ENCSR238SGC.chipseeker_annotation.tsv' assert os.path.exists(annotation_file) - assert utils.count_lines(annotation_file) == 149284 + assert utils.count_lines(annotation_file) == 152255 @pytest.mark.pairedend diff --git a/workflow/tests/test_generate_software_references.py b/workflow/tests/test_generate_software_references.py index 6891bf929dacd0cf5206254d86ed17797286ddd4..ce3640ccaf644ae2c53c19608f9f9dd381f130ca 100644 --- a/workflow/tests/test_generate_software_references.py +++ b/workflow/tests/test_generate_software_references.py @@ -11,4 +11,13 @@ test_output_path = os.path.dirname(os.path.abspath(__file__)) + \ @pytest.mark.singleend def test_software_references(): - assert os.path.exists(os.path.join(test_output_path, 'software_references_mqc.txt')) + assert os.path.exists(os.path.join(test_output_path, 'software_references_mqc.yaml')) + + +@pytest.mark.singleend +def test_software_references_output(): + software_references = os.path.join(test_output_path, 'software_references_mqc.yaml') + with open(software_references, 'r') as stream: + data_loaded = yaml.load(stream) + + assert len(data_loaded['data'].split('<dt>')) == 17 diff --git a/workflow/tests/test_overlap_peaks.py b/workflow/tests/test_overlap_peaks.py index 411bfd09ef3ebc437b7d90e75bcad3af2a8a7496..ff61c937f42af911bba8e8e21acde80bd41a592e 100644 --- a/workflow/tests/test_overlap_peaks.py +++ b/workflow/tests/test_overlap_peaks.py @@ -37,7 +37,7 @@ def test_check_update_design(design_diff): def test_overlap_peaks_singleend(): assert os.path.exists(os.path.join(test_output_path, 'ENCSR238SGC.rejected.narrowPeak')) peak_file = test_output_path + 'ENCSR238SGC.replicated.narrowPeak' - assert utils.count_lines(peak_file) == 149291 + assert utils.count_lines(peak_file) == 152262 @pytest.mark.pairedend