Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove minify-html #57

Merged
merged 1 commit into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified eva_sub_cli/etc/eva_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 2 additions & 6 deletions eva_sub_cli/report.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import base64
import os.path
import re

from jinja2 import Environment, FileSystemLoader

Expand Down Expand Up @@ -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
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ebi_eva_common_pyutils==0.6.10
jinja2
jsonschema
minify_html==0.11.1
openpyxl
pyyaml
requests
Expand Down
463 changes: 457 additions & 6 deletions tests/resources/validation_reports/expected_report_metadata_json.html

Large diffs are not rendered by default.

475 changes: 469 additions & 6 deletions tests/resources/validation_reports/expected_report_metadata_xlsx.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading