Skip to content

Commit 40b72da

Browse files
committed
Install repos for all tested artifacts
1 parent fd41051 commit 40b72da

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

planemo/engine/galaxy.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ class GalaxyEngine(BaseEngine, metaclass=abc.ABCMeta):
4747
def _run(self, runnables, job_paths):
4848
"""Run job in Galaxy."""
4949
results = []
50-
for runnable, job_path in zip(runnables, job_paths):
51-
self._ctx.vlog(f"Serving artifact [{runnable}] with Galaxy.")
52-
with self.ensure_runnables_served([runnable]) as config:
53-
self._ctx.vlog(f"Running job path [{job_path}]")
50+
with self.ensure_runnables_served(runnables) as config:
51+
for runnable, job_path in zip(runnables, job_paths):
52+
self._ctx.log(f"Running [{runnable}] - [{job_path}] with Galaxy.")
5453
if self._ctx.verbose:
5554
self._ctx.log(f"Running Galaxy with API configuration [{config.user_api_config}]")
5655
run_response = execute(self._ctx, config, runnable, job_path, **self._kwds)

planemo/galaxy/workflows.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Dict,
99
List,
1010
)
11+
from typing import TYPE_CHECKING
1112
from urllib.parse import urlparse
1213

1314
import yaml
@@ -27,11 +28,20 @@
2728

2829
from planemo.galaxy.api import gi
2930
from planemo.io import warn
31+
from typing_extensions import NamedTuple
32+
33+
if TYPE_CHECKING:
34+
from ephemeris.shed_tools import InstallRepoDict
3035

3136
FAILED_REPOSITORIES_MESSAGE = "Failed to install one or more repositories."
3237
GALAXY_WORKFLOWS_PREFIX = "gxid://workflows/"
3338

3439

40+
class InstalledShedRepos(NamedTuple):
41+
installed_repositories: List["InstallRepoDict"]
42+
updated_repositories: List["InstallRepoDict"]
43+
44+
3545
def load_shed_repos(runnable):
3646
if runnable.type.name != "galaxy_workflow":
3747
return []

0 commit comments

Comments
 (0)