Manually merge branch 'dev' for 2.9.1

galaxyproject · Jul 24, 2024 · d1716b1 · d1716b1
2 parents 8074b29 + a5892ac
commit d1716b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/abm/lib/benchmark.py b/abm/lib/benchmark.py
@@ -458,7 +458,7 @@ def wait_for_jobs(context, gi: GalaxyInstance, invocations: dict):
     jobs = gi.jobs.get_jobs(history_id=hid)
     for job in jobs:
         data = gi.jobs.show_job(job['id'], full_details=True)
-        data['job_metrics'] = gi.jobs.get_job_metrics(job['id'])
+        data['job_metrics'] = gi.jobs.get_metrics(job['id'])
         metrics = {
             'run': run,
             'cloud': cloud,

diff --git a/abm/lib/common.py b/abm/lib/common.py
@@ -11,7 +11,7 @@
 from ruamel.yaml import YAML
 
 # Where we will look for our configuration file.
-PROFILE_SEARCH_PATH = ['~/.abm/profile.yml', '.abm-profile.yml']
+PROFILE_SEARCH_PATH = ['.abm/profile.yml', '~/.abm/profile.yml', '.abm-profile.yml']
 
 # Deprecated. Do not use.
 datasets = {

diff --git a/abm/lib/experiment.py b/abm/lib/experiment.py
@@ -236,7 +236,7 @@ def summarize(context: Context, args: list):
     'runtime_seconds',
     'cpuacct.usage',
     'memory.limit_in_bytes',
-    'memory.peak'
+    'memory.peak',
     #'memory.max_usage_in_bytes',
 ]  # ,'memory.soft_limit_in_bytes']
 

diff --git a/abm/lib/workflow.py b/abm/lib/workflow.py
@@ -134,6 +134,10 @@ def import_from_config(context: Context, args: list):
         print("ERROR: no workflow ID given")
         return
 
+    if key.startswith('http'):
+        import_from_url(context, args)
+        return
+
     if config is None:
         config = find_config("workflows.yml")
     if config is None: