Commit 46e7bf19 authored by Brian Moe's avatar Brian Moe

Mostly packaging mods

parent 8c0551e5
ligo-gracedb (1.8-1) unstable; urgency=low
* Incorporated Leo's patch for fixing import problem
-- Brian Moe <brian.moe@ligo.org> Fri, 04 Jan 2013 15:01:58 -0500
ligo-gracedb (1.7-1) unstable; urgency=low ligo-gracedb (1.7-1) unstable; urgency=low
* Workaround for Python bug http://bugs.python.org/issue11898 * Workaround for Python bug http://bugs.python.org/issue11898
......
%define name ligo-gracedb
%define version 1.7
%define unmangled_version 1.7
%define release 1
Summary: Gravity Wave Candidate Event Database
Name: %{name}
Version: %{version}
Release: %{release}
Source0: %{name}-%{unmangled_version}.tar.gz
License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Prefix: %{_prefix}
BuildArch: noarch
Vendor: Brian Moe <brian.moe@ligo.org>
Requires: ligo-common m2crypto
Url: http://www.lsc-group.phys.uwm.edu/daswg/gracedb.html
%description
The gravitational-wave candidate event database (GraCEDb) is a prototype
system to organize candidate events from gravitational-wave searches and
to provide an environment to record information about follow-ups. A simple
client tool is provided to submit a candidate event to the database.
%prep
%setup -n %{name}-%{unmangled_version}
%build
python setup.py build
%install
python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
%clean
rm -rf $RPM_BUILD_ROOT
%files -f INSTALLED_FILES
%defattr(-,root,root)
%exclude %{python_sitelib}/ligo/gracedb/*pyo
%exclude %{python_sitelib}/ligo/gracedb/test/*pyo
__all__ = ["cli", "rest"] __all__ = ["cli", "rest"]
GIT_TAG = 'gracedb-1.7-1' GIT_TAG = 'gracedb-1.8-1'
...@@ -23,7 +23,7 @@ import json ...@@ -23,7 +23,7 @@ import json
DEFAULT_SERVICE_URL = "https://gracedb.ligo.org/gracedb/cli" DEFAULT_SERVICE_URL = "https://gracedb.ligo.org/gracedb/cli"
GIT_TAG = 'gracedb-1.7-1' GIT_TAG = 'gracedb-1.8-1'
#----------------------------------------------------------------- #-----------------------------------------------------------------
# Util routines # Util routines
...@@ -259,7 +259,7 @@ class Client: ...@@ -259,7 +259,7 @@ class Client:
host, port, key_file=key, cert_file=cert) host, port, key_file=key, cert_file=cert)
self.url = url self.url = url
# XXX sad sad hack for transition from our somewhat ad hoc to rest api. # XXX sad sad hack for transition from our somewhat ad hoc to rest api.
if url.endswith('cli'): if url.endswith('cli') or url.endswith('cli/'):
self.rest_url = url[:url.rindex('cli')]+"api" self.rest_url = url[:url.rindex('cli')]+"api"
else: else:
self.rest_url = url self.rest_url = url
......
...@@ -3,7 +3,7 @@ import os ...@@ -3,7 +3,7 @@ import os
from distutils.core import setup from distutils.core import setup
version = "1.7" version = "1.8"
setup( setup(
name = "ligo-gracedb", name = "ligo-gracedb",
...@@ -19,7 +19,7 @@ setup( ...@@ -19,7 +19,7 @@ setup(
packages = [ 'ligo.gracedb', 'ligo.gracedb.test'], packages = [ 'ligo.gracedb', 'ligo.gracedb.test'],
package_data = { 'ligo.gracedb.test' : ['data/*', 'test.sh'] }, package_data = { 'ligo.gracedb.test' : ['data/*', 'test.sh'] },
requires = ['ligo', 'M2Crypto', 'cjson'], requires = ['ligo', 'M2Crypto'],
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