Toward new Galaxy library structure...

pulsar/client/test/check.py

@@ -17,8 +17,14 @@ import traceback
 from collections import namedtuple
 from io import open
 
-from galaxy.tools.deps.dependencies import DependenciesDescription
-from galaxy.tools.deps.requirements import ToolRequirement
+try:
+    # If galaxy-lib or Galaxy 19.05 present.
+    from galaxy.tools.deps.dependencies import DependenciesDescription
+    from galaxy.tools.deps.requirements import ToolRequirement
+except ImportError:
+    # If galaxy-tool-util or Galaxy 19.09 present.
+    from galaxy.tool_util.deps.dependencies import DependenciesDescription
+    from galaxy.tool_util.deps.requirements import ToolRequirement
 from six import binary_type
 
 from pulsar.client import (

pulsar/core.py

@@ -9,8 +9,18 @@ from pulsar.tools import ToolBox
 from pulsar.tools.authorization import get_authorizer
 from pulsar import messaging
 from galaxy.objectstore import build_object_store_from_config
-from galaxy.tools.deps import DependencyManager
-from galaxy.jobs.metrics import JobMetrics
+try:
+    # If galaxy-lib or Galaxy <19.05 present.
+    from galaxy.tools.deps import DependencyManager
+except ImportError:
+    # If galaxy-tool-util or Galaxy >=19.09 present.
+    from galaxy.tool_util.deps import DependencyManager
+try:
+    # If galaxy-lib or Galaxy <19.05 present.
+    from galaxy.jobs.metrics import JobMetrics
+except ImportError:
+    # If galaxy-job-metrics or Galaxy >=19.09 present.
+    from galaxy.job_metrics import JobMetrics
 from galaxy.util.bunch import Bunch
 
 from logging import getLogger

pulsar/managers/stateful.py

@@ -6,7 +6,12 @@ import os
 import time
 import threading
 
-from galaxy.tools.deps import dependencies
+try:
+    # If galaxy-lib or Galaxy 19.05 present.
+    from galaxy.tools.deps.dependencies import DependenciesDescription
+except ImportError:
+    # If galaxy-tool-util or Galaxy 19.09 present.
+    from galaxy.tool_util.deps.dependencies import DependenciesDescription
 
 from pulsar.client.util import filter_destination_params
 from pulsar.managers import ManagerProxy
@@ -109,7 +114,7 @@ class StatefulManagerProxy(ManagerProxy):
             yield
             launch_kwds = {}
             if launch_config.get("dependencies_description"):
-                dependencies_description = dependencies.DependenciesDescription.from_dict(launch_config["dependencies_description"])
+                dependencies_description = DependenciesDescription.from_dict(launch_config["dependencies_description"])
                 launch_kwds["dependencies_description"] = dependencies_description
             for kwd in ["submit_params", "setup_params", "env"]:
                 if kwd in launch_config: