Skip to content
Snippets Groups Projects

fix absolute / relative path issue in fastqc results parsing

Merged BIOPZ-Bak Maciej requested to merge fastqc_parsing_bugfix into master
All threads resolved!
1 file
+ 26
15
Compare changes
  • Side-by-side
  • Inline
+ 26
15
@@ -970,7 +970,7 @@ rule prepare_files_for_report:
output:
samples_dir = directory(os.path.join(
"{output_dir}",
config["output_dir"],
"samples"))
params:
results_dir = config["output_dir"],
@@ -979,9 +979,12 @@ rule prepare_files_for_report:
config["log_dir"],
"samples")
log:
LOG_local_log = \
os.path.join("{output_dir}", "local_log", \
"prepare_files_for_report.log")
stderr = os.path.join(
config["log_dir"],
"prepare_files_for_report.stderr.log"),
stdout = os.path.join(
config["log_dir"],
"prepare_files_for_report.stdout.log")
run:
# remove "single/paired end" from the results directories
@@ -1111,6 +1114,7 @@ rule prepare_files_for_report:
+1
sample_name = zipfile.split("/")[-3]
zipfile_path_chunks = zipfile.split("/")
new_path = os.path.join(*(zipfile_path_chunks[:-1]))
+2
if params.results_dir.startswith("/"): new_path = "/" + new_path
with ZipFile(zipfile, 'r') as zip_f:
zip_f.extractall(new_path)
fastqc_data_f = os.path.join(
@@ -1180,11 +1184,11 @@ rule prepare_MultiQC_config:
'''
input:
multiqc_input_dir = os.path.join(
"{output_dir}",
config["output_dir"],
"samples")
output:
multiqc_config = os.path.join(
"{output_dir}",
config["output_dir"],
"MultiQC_config.yaml")
params:
logo_path = os.path.join(
@@ -1194,9 +1198,12 @@ rule prepare_MultiQC_config:
"logo.128px.png"),
results_dir = config["output_dir"]
log:
LOG_local_log = \
os.path.join("{output_dir}", "local_log", \
"prepare_MultiQC_config.log")
stderr = os.path.join(
config["log_dir"],
"prepare_MultiQC_config.stderr.log"),
stdout = os.path.join(
config["log_dir"],
"prepare_MultiQC_config.stdout.log")
run:
with open(output.multiqc_config, "w") as YAML:
YAML.write("---\n\n")
@@ -1259,15 +1266,19 @@ rule MULTIQC_report:
config["output_dir"],
"MultiQC_config.yaml")
output:
MultiQC_report = \
directory(os.path.join("{output_dir}", "multiqc_summary"))
MultiQC_report = directory(os.path.join(
config["output_dir"],
"multiqc_summary"))
params:
results_dir = config["output_dir"],
log_dir = config["log_dir"]
log:
LOG_local_log = \
os.path.join("{output_dir}", "local_log", \
"MULTIQC_report.log")
stderr = os.path.join(
config["log_dir"],
"MULTIQC_report.stderr.log"),
stdout = os.path.join(
config["log_dir"],
"MULTIQC_report.stdout.log")
singularity:
"docker://ewels/multiqc:1.7"
shell:
@@ -1277,5 +1288,5 @@ rule MULTIQC_report:
--config {input.multiqc_config} \
{params.results_dir} \
{params.log_dir} \
&> {log.LOG_local_log};
1> {log.stdout} 2> {log.stderr}
"""
Loading