Skip to content

Commit

Permalink
Merge pull request #18606 from mvdbeek/pin_weasyprint_version
Browse files Browse the repository at this point in the history
[24.0] Set minimum weasyprint version
  • Loading branch information
nsoranzo authored Jul 29, 2024
2 parents f15f028 + 6905811 commit 9191eee
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
4 changes: 4 additions & 0 deletions lib/galaxy/dependencies/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,10 @@ def check_weasyprint(self):
# 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"

def check_custos_sdk(self):
return "custos" == self.vault_type

Expand Down
7 changes: 6 additions & 1 deletion lib/galaxy/dependencies/conditional-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.11; python_version<"3.9"

# AWS Batch runner
boto3

0 comments on commit 9191eee

Please sign in to comment.