Skip to content

Commit

Permalink
Merge pull request #234 from galaxyproject/dev
Browse files Browse the repository at this point in the history
Patch release 2.7.5
  • Loading branch information
ksuderman authored Jul 29, 2023
2 parents 85e908b + b89b350 commit 06d223c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion abm/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.0-dev.1
2.7.5
3 changes: 3 additions & 0 deletions abm/lib/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ def get_keys(d: dict):


def find_history(gi, name_or_id):
history = gi.histories.get_histories(history_id=name_or_id)
if history is not None and len(history) > 0:
return history[0]['id']
history = gi.histories.get_histories(name=name_or_id)
if history is None:
return name_or_id
Expand Down
2 changes: 2 additions & 0 deletions abm/lib/experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ def test(context: Context, args: list):

def parse_toolid(id:str) -> str:
parts = id.split('/')
if len(parts) < 2:
return f"{id},unknown"
return f"{parts[-2]},{parts[-1]}"


Expand Down
2 changes: 1 addition & 1 deletion abm/lib/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,5 @@ def rerun(context: Context, args: list):
print("ERROR: no job ID provided")
return
gi = connect(context)
result = gi.jobs.rerun_job(args[0])
result = gi.jobs.rerun_job(args[0], remap=True)
print_json(result)

0 comments on commit 06d223c

Please sign in to comment.