From 77efbaf792df90aba6514cb9fb379bf97e5cb117 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sun, 28 Jul 2024 13:17:28 +0200 Subject: [PATCH] Lower weasyprint versino pin and fix problematic transitive dependency --- lib/galaxy/dependencies/__init__.py | 4 ++++ lib/galaxy/dependencies/conditional-requirements.txt | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py index 17aa22c8d60..437e5e82ee2 100644 --- a/lib/galaxy/dependencies/__init__.py +++ b/lib/galaxy/dependencies/__init__.py @@ -288,6 +288,10 @@ class ConditionalDependencies: # See notes in ./conditional-requirements.txt for more information. return os.environ.get("GALAXY_DEPENDENCIES_INSTALL_WEASYPRINT") == "1" + def check_pydyf(self): + # See notes in ./conditional-requirements.txt for more information. + return os.environ.get("GALAXY_DEPENDENCIES_INSTALL_WEASYPRINT") == "1" and sys.version_info < (3, 9) + def check_custos_sdk(self): return "custos" == self.vault_type diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt index 52b04ab8787..67693579b10 100644 --- a/lib/galaxy/dependencies/conditional-requirements.txt +++ b/lib/galaxy/dependencies/conditional-requirements.txt @@ -56,7 +56,12 @@ tensorflow==2.9.3 # xref https://github.com/galaxyproject/galaxy/pull/9651 # Run run.sh or common_startup script with GALAXY_DEPENDENCIES_INSTALL_WEASYPRINT=1 # to install weasyprint as part of Galaxy's conditonal dependency instalation process. -weasyprint>=62.3 +weasyprint>=61.2 +# We pin the transitive weasyprint dependency pydyf here because newer versions are +# not compatible with the last weasyprint version that still supports python 3.8. +# This dependency is ignored on python >= 3.9 and should be removed when deprecating +# support for python 3.8. +pydyf==0.10.0 # AWS Batch runner boto3