Maintenance will be performed on git.ligo.org, chat.ligo.org, containers.ligo.org, and docs.ligo.org on the morning of Tuesday 11th August 2020, starting at approximately 9am PDT. It is expected to take around 20 minutes and there will be a short period of downtime (less than five minutes) towards the end of the maintenance window. Please direct any comments, questions, or concerns to computing-help@ligo.org.

Commit a7afaf90 authored by Brian Moe's avatar Brian Moe

Changed json package to one available at the sites.

parent 6d1cb11e
ligo-gracedb (1.3-1) unstable; urgency=low
* Replaced simplejson with cjson.
* simplejson not available everywhere in the LSC.
-- Brian Moe <brian.moe@ligo.org> Thu, 14 Jun 2012 11:40:06 -0600
ligo-gracedb (1.2-1) unstable; urgency=low ligo-gracedb (1.2-1) unstable; urgency=low
* Added file download command. * Added file download command.
......
...@@ -8,7 +8,7 @@ XS-Python-Version: all ...@@ -8,7 +8,7 @@ XS-Python-Version: all
Package: python-ligo-gracedb Package: python-ligo-gracedb
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-m2crypto Depends: ${misc:Depends}, ${python:Depends}, python-m2crypto, python-cjson
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Provides: ${python:Provides} Provides: ${python:Provides}
Description: Gravity Wave Candidate Event Database Description: Gravity Wave Candidate Event Database
......
...@@ -22,11 +22,11 @@ __all__ = ["utils"] ...@@ -22,11 +22,11 @@ __all__ = ["utils"]
import httplib, mimetypes, urllib import httplib, mimetypes, urllib
import socket import socket
import os, sys, shutil import os, sys, shutil
import simplejson import cjson
DEFAULT_SERVICE_URL = "https://gracedb.ligo.org/gracedb/cli" DEFAULT_SERVICE_URL = "https://gracedb.ligo.org/gracedb/cli"
GIT_TAG = 'gracedb-1.2-1' GIT_TAG = 'gracedb-1.3-1'
#----------------------------------------------------------------- #-----------------------------------------------------------------
# Util routines # Util routines
...@@ -526,7 +526,7 @@ Longer strings will be truncated.""" % { ...@@ -526,7 +526,7 @@ Longer strings will be truncated.""" % {
# get/print listing. # get/print listing.
response = client.listfiles(graceid) response = client.listfiles(graceid)
if response and response.status == 200: if response and response.status == 200:
for fname in simplejson.loads(response.read()): for fname in cjson.decode(response.read()):
print(fname) print(fname)
exit(0) exit(0)
print(response.reason) print(response.reason)
......
[bdist_rpm] [bdist_rpm]
requires = ligo-common m2crypto requires = ligo-common m2crypto python-cjson
release = 1 release = 1
...@@ -3,7 +3,7 @@ import os ...@@ -3,7 +3,7 @@ import os
from distutils.core import setup from distutils.core import setup
version = "1.2" version = "1.3"
setup( setup(
name = "ligo-gracedb", name = "ligo-gracedb",
...@@ -18,7 +18,7 @@ setup( ...@@ -18,7 +18,7 @@ setup(
provides = ['ligo.gracedb'], provides = ['ligo.gracedb'],
packages = [ 'ligo.gracedb'], packages = [ 'ligo.gracedb'],
requires = ['ligo', 'M2Crypto'], requires = ['ligo', 'M2Crypto', 'cjson'],
scripts = [ scripts = [
os.path.join('bin','gracedb'), os.path.join('bin','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