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.

Sign up for GitHub

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

[24.0] Set minimum weasyprint version #18606

Merged
merged 4 commits into from
Jul 29, 2024
Merged

[24.0] Set minimum weasyprint version #18606

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67e89d9
Set minimum weasyprint version
mvdbeek Jul 28, 2024
77efbaf
Lower weasyprint versino pin and fix problematic transitive dependency
mvdbeek Jul 28, 2024
0a637a5
Use python version syntax
mvdbeek Jul 28, 2024
6905811
Pin pydyf to < 0.11
mvdbeek Jul 29, 2024
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
4 changes: 4 additions & 0 deletions lib/galaxy/dependencies/__init__.py
View file
Open in desktop
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
View file
Open in desktop
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.12; python_version<"3.9"
mvdbeek marked this conversation as resolved.
Show resolved Hide resolved

# AWS Batch runner
boto3
Loading