From 0a637a5b02bd44d3a5d15aaf129462edf5fa0c8b Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Sun, 28 Jul 2024 21:13:32 +0200 Subject: [PATCH] Use python version syntax I don't think this works with our custom parsing, but worth a try. Co-authored-by: Nicola Soranzo --- lib/galaxy/dependencies/__init__.py | 2 +- lib/galaxy/dependencies/conditional-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py index 437e5e82ee2..95011848eaf 100644 --- a/lib/galaxy/dependencies/__init__.py +++ b/lib/galaxy/dependencies/__init__.py @@ -290,7 +290,7 @@ class ConditionalDependencies: 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) + return os.environ.get("GALAXY_DEPENDENCIES_INSTALL_WEASYPRINT") == "1" 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 67693579b10..ee55dac30c1 100644 --- a/lib/galaxy/dependencies/conditional-requirements.txt +++ b/lib/galaxy/dependencies/conditional-requirements.txt @@ -61,7 +61,7 @@ weasyprint>=61.2 # 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 +pydyf<0.12; python_version<"3.9" # AWS Batch runner boto3