Gitlab will migrate to a new storage backend starting 0300 UTC on 2020-04-04. We do not anticipate a maintenance window for this migration. Performance may be impacted over the weekend. Thanks for your patience.

Commit a041dc87 authored by Brian Moe's avatar Brian Moe

Bug fix. Typo Fix.

parent 226a4660
ligo-gracedb (1.10-1) unstable; urgency=low
* CLI replace feature had subtle openssl bug. Using REST client.
* Typo in help text.
* Typo in test.py wrt CWB test data.
ligo-gracedb (1.9-1) unstable; urgency=low
* Added slot feature to command line interface
......
__all__ = ["cli", "rest"]
GIT_TAG = 'gracedb-1.9-1'
GIT_TAG = 'gracedb-1.10-1'
......@@ -23,7 +23,7 @@ import json
DEFAULT_SERVICE_URL = "https://gracedb.ligo.org/gracedb/cli"
GIT_TAG = 'gracedb-1.9-1'
GIT_TAG = 'gracedb-1.10-1'
#-----------------------------------------------------------------
# Util routines
......@@ -383,17 +383,12 @@ class Client:
return self._upload('create', fields, files)
def replace(self, graceid, filename, filecontents=None):
if filecontents is None:
if filename == '-':
filename = 'initial.data'
filecontents = sys.stdin.read()
else:
filecontents = open(filename, 'r').read()
fields = []
files = [('eventFile', filename, filecontents)]
# XXX URL should be discovered, not assumed. OK - this cli is deprecated.
url = "%s/events/%s" % (self.rest_url, graceid)
response = self._upload(url, fields, files, http_method="PUT", rawresponse=True)
from ligo.gracedb.rest import GraceDb
url = self.rest_url
if url[-1] != '/':
url += '/'
server = GraceDb(url)
response = server.replaceEvent(graceid, filename, filecontents)
if response.status == 202: # Accepted
return "%s updated" % graceid
else:
......@@ -475,8 +470,8 @@ def main():
%%prog [options] label GRACEID LABEL
Label event with GRACEDID with LABEL. LABEL must already exist.
%%prog [options] slot GRACEID [filename]
Tag an uploaded file with a name.
%%prog [options] slot GRACEID slotname [filename]
Tag an uploaded file with a name or view value of slotname.
%%prog [options] search SEARCH PARAMS
Search paramaters are a list of requirements to be satisfied. They
......
......@@ -156,7 +156,7 @@ class TestGracedb(unittest.TestCase):
cwb_event = r.json()
self.assertEqual(cwb_event['group'], "Test")
self.assertEqual(cwb_event['analysisType'], "CWB")
self.assertEqual(cwb_event['gpstime'], 1012125588)
self.assertEqual(cwb_event['gpstime'], 1042312876)
def test_create_lowmass(self):
"""Create a Low Mass event"""
......
......@@ -3,7 +3,7 @@ import os
from distutils.core import setup
version = "1.9"
version = "1.10"
setup(
name = "ligo-gracedb",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment