Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 2.7.2 #222

Merged
merged 2 commits into from
Jun 24, 2023
Merged

Patch 2.7.2 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
608a3ef
Allow history names for most commands
ksuderman Jun 24, 2023
bd11e1c
Bump version number
ksuderman Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion abm/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
2.7.2
18 changes: 11 additions & 7 deletions abm/lib/history.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ def show(context: Context, args: list):
print("ERROR: No history ID provided.")
return
gi = connect(context)
history = gi.histories.show_history(args[0], contents=contents)
hid = find_history(gi, args[0])
if hid is None:
print(f"ERROR: No such history {args[0]}")
return
history = gi.histories.show_history(hid, contents=contents)
print(json.dumps(history, indent=4))


Expand Down Expand Up @@ -127,8 +131,8 @@ def export(context: Context, args: list):
if len(args) == 0:
print("ERROR: no history ID specified")
return
hid = args[0]
gi = connect(context)
hid = find_history(gi, args[0])
jeha_id = gi.histories.export_history(hid, gzip=True, wait=wait)
# global GALAXY_SERVER
export_url = "unknown"
Expand All @@ -154,7 +158,7 @@ def publish(context: Context, args: list):
print("ERROR: No history ID provided.")
return
gi = connect(context)
result = gi.histories.update_history(args[0], published=True)
result = gi.histories.update_history(find_history(gi, args[0]), published=True)
print(f"Published: {result['published']}")


Expand All @@ -164,7 +168,7 @@ def rename(context: Context, args: list):
print("USAGE: rename ID 'new history name'")
return
gi = connect(context)
result = gi.histories.update_history(args[0], name=args[1])
result = gi.histories.update_history(find_history(gi, args[0]), name=args[1])
print(f"History renamed to {result['name']}")


Expand Down Expand Up @@ -272,7 +276,7 @@ def copy(context:Context, args:list):
if len(args) != 2:
print("ERROR: Invalid parameters. Provide a history ID and new history name.")
return
id = args[0]
id = find_history(args[0])
name = args[1]

gi = connect(context)
Expand Down Expand Up @@ -318,7 +322,7 @@ def tag(context: Context, args: list):
return

gi = connect(context)
hid = args.pop(0)
hid = find_history(gi, args.pop(0))
if not replace:
history = gi.histories.show_history(hid, contents=False)
args += history['tags']
Expand All @@ -332,7 +336,7 @@ def summarize(context: Context, args: list):
gi = connect(context)
all_jobs = []
while len(args) > 0:
hid = args.pop(0)
hid = find_history(gi, args.pop(0))
history = gi.histories.show_history(history_id=hid)
jobs = gi.jobs.get_jobs(history_id=hid)
for job in jobs:
Expand Down