Merge pull request #21720 from mvdbeek/strip_line_comments

[25.1] Strip inline comments in conditional requirements

Author: mvdbeek

lib/galaxy/dependencies/__init__.py

@@ -3,6 +3,7 @@
 """
 
 import os
+import re
 import sys
 from os.path import (
     dirname,
@@ -337,6 +338,12 @@ def check_huggingface_hub(self):
         return "huggingface" in self.file_sources
 
 
+def strip_comment(line):
+    # lifted from https://github.com/tox-dev/tox/commit/3c6b4f204e89852c4b7536b246a66d20be6d39ec
+    # xref https://github.com/pyupio/dparse/issues/34
+    return re.sub(r"\s+#.*", "", line).strip()
+
+
 def optional(config_file=None):
     if not config_file:
         config_file = find_config_file(["galaxy", "universe_wsgi"], include_samples=True)
@@ -347,5 +354,5 @@ def optional(config_file=None):
     conditional = ConditionalDependencies(config_file)
     for dependency in conditional.conditional_reqs:
         if conditional.check(dependency.name):
-            rval.append(dependency.line)
+            rval.append(strip_comment(dependency.line))
     return rval