Lower weasyprint versino pin and fix problematic transitive dependency

This commit is contained in:
mvdbeek
2024-07-28 13:17:28 +02:00
parent 67e89d943f
commit 77efbaf792
2 changed files with 10 additions and 1 deletions
+4
View File
@@ -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
@@ -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