Merge pull request #57 from tcezard/remove_minify

Remove minify-html
EBIvariation · Sep 16, 2024 · 9a18cc1 · 9a18cc1
2 parents faee2c8 + db9cf03
commit 9a18cc1
Show file tree

Hide file tree

Showing 6 changed files with 1,421 additions and 25 deletions.
diff --git a/eva_sub_cli/etc/eva_logo.png b/eva_sub_cli/etc/eva_logo.png
diff --git a/eva_sub_cli/report.py b/eva_sub_cli/report.py
@@ -1,5 +1,6 @@
 import base64
 import os.path
+import re
 
 from jinja2 import Environment, FileSystemLoader
 
@@ -35,10 +36,5 @@ def generate_html_report(validation_results, validation_date, submission_dir, vc
         vcf_fasta_analysis_mapping=vcf_fasta_analysis_mapping,
         validation_results=validation_results
     )
+    return re.sub('\s+\n', '\n', rendered_template)
 
-    try:
-        # minify-html is not included in conda installation currently
-        from minify_html import minify_html
-        return minify_html.minify(rendered_template, minify_js=True, remove_processing_instructions=True)
-    except ImportError:
-        return rendered_template
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
 ebi_eva_common_pyutils==0.6.10
 jinja2
 jsonschema
-minify_html==0.11.1
 openpyxl
 pyyaml
 requests

diff --git a/tests/resources/validation_reports/expected_report_metadata_json.html b/tests/resources/validation_reports/expected_report_metadata_json.html
diff --git a/tests/resources/validation_reports/expected_report_metadata_xlsx.html b/tests/resources/validation_reports/expected_report_metadata_xlsx.html
diff --git a/tests/resources/validation_reports/expected_shallow_metadata_xlsx_report.html b/tests/resources/validation_reports/expected_shallow_metadata_xlsx_report.html