Commit c3e88ed7 authored by Brian Moe's avatar Brian Moe

Revering to tag gracedb-1.0.3. Fixing Bug.

parent 3b937859
==================================================================
python setup.py install --install-layout=deb
Will put things into dist-packages. Jeeze.
==================================================================
Following instructions at: http://wiki.debian.org/Python/Packaging
Make a tarball with "setup.py sdist"
py2dsc -m 'Brian Moe <brian.moe@ligo.org>' ligo-gracedb-1.0.tar.gz
mv stuff in deb_dist/.../debian to debian/
careful preserving existing changelog
copy over copyright file
check Standards-version in control file. should be (at least) 3.8.4
check Depends in control file. misc:Depends and python-m2crypto might be missing
Depends: ${misc:Depends}, ${python:Depends}, python-m2crypto
modify changelog
bump release in setup.cfg -- make it match debian/changelog
bump GIT_TAG
check-in
tag
build pkgs
push (and remember to push tags)
debuild -i -us -uc -b
Change the "-b" to "-S" to build only a source package.
forget all the py2dsc, debuild stuff. Just announce new source. MANIFEST.in
will include debian/ so Debian maintainers can deal with the details.
==================================================================
Problems with SRPMS. When Xavier tries to build.
got these errors while building:
gracedb:
---------
Checking for unpackaged file(s): /usr/lib/rpm/check-files /root/rpmbuild/BUILDROOT/ligo-gracedb-1.0-3.x86_64
error: Installed (but unpackaged) file(s) found:
/usr/lib/python2.6/site-packages/ligo/gracedb/__init__.pyo
/usr/lib/python2.6/site-packages/ligo/gracedb/utils.pyo
RPM build errors:
Installed (but unpackaged) file(s) found:
/usr/lib/python2.6/site-packages/ligo/gracedb/__init__.pyo
/usr/lib/python2.6/site-packages/ligo/gracedb/utils.pyo
env died with exit status 1
Wed Dec 14 11:04:23 2011
He suggests:
to solve this, please add to your copy of the spec files [also in your GIT
repos, if any], the following line:
gracedb:
----------
%files -f INSTALLED_FILES
%defattr(-,root,root)
%exclude %{python_sitelib}/ligo/gracedb/*pyo <-- this
lvalert:
------------
%files -f INSTALLED_FILES
%defattr(-,root,root)
%exclude %{python_sitelib}/ligo/lvalert/*pyo <-- this
But really... WHY? Why is the SRPM wrong?
SOLN:
python setup.py bdist_rpm --spec-only
vi dist/FooBar-1.0.spec
python setup.py bdist_rpm --spec-file=dist/FooBar-1.0.spec
Oh. But this does not work. --spec-file option is not recognized. Nice.
The docs (the same ones with the bad --spec-file advice) suggest a "better"
way to do this is "to override the standard bdist_rpm command with one that
writes whatever else you want to the .spec file"
http://docs.python.org/release/2.0/dist/creating-rpms.html
ligo-gracedb (1.0-4) unstable; urgency=low
* Fix typo in command line client. (query -> search)
-- Brian Moe <brian.moe@ligo.org> Fri, 20 Jan 2012 19:15:23 -0600
ligo-gracedb (1.0-3) unstable; urgency=low
* Made lib from gracedb script.
......
......@@ -25,7 +25,7 @@ import os, sys
DEFAULT_SERVICE_URL = "https://gracedb.ligo.org/gracedb/cli"
GIT_TAG = 'gracedb-1.0-4'
GIT_TAG = 'gracedb-1.0-3'
#-----------------------------------------------------------------
# Util routines
......@@ -472,7 +472,7 @@ Longer strings will be truncated.""" % {
label = args[2]
response = client.label(graceid, label, alert=options.alert)
elif args[0] == 'search':
response = client.search(" ".join(args[1:]))
response = client.query(" ".join(args[1:]))
elif len(args) == 3:
group = args[0]
type = args[1]
......
......@@ -3,16 +3,11 @@
from math import log
from time import gmtime, strftime
try:
from pylal import Fr
from glue.lal import LIGOTimeGPS
from glue.ligolw import ligolw
from glue.ligolw import table
from glue.ligolw import lsctables
except ImportError:
import warnings
warnings.warn("pylal and/or glue not installed. Most features of ligo.gracedb.utils will be unavailable.")
from pylal import Fr
from glue.lal import LIGOTimeGPS
from glue.ligolw import ligolw
from glue.ligolw import table
from glue.ligolw import lsctables
##############################################################################
#
......@@ -20,19 +15,16 @@ except ImportError:
#
##############################################################################
try:
#Need these for each search: inspiral, burst, etc.
InspiralCoincDef = lsctables.CoincDef(search = u"inspiral", \
search_coinc_type = 0, \
description = \
u"sngl_inspiral<-->sngl_inspiral coincidences")
#these should work for both Omega and CWB
BurstCoincDef = lsctables.CoincDef(search = u"burst", \
search_coinc_type = 0, \
description = \
u"coherent burst coincidences")
except NameError:
pass
#Need these for each search: inspiral, burst, etc.
InspiralCoincDef = lsctables.CoincDef(search = u"inspiral", \
search_coinc_type = 0, \
description = \
u"sngl_inspiral<-->sngl_inspiral coincidences")
#these should work for both Omega and CWB
BurstCoincDef = lsctables.CoincDef(search = u"burst", \
search_coinc_type = 0, \
description = \
u"coherent burst coincidences")
#list of detectors participating in the coinc
#MBTA only sends triples to gracedb at the time being so this list is
......
[bdist_rpm]
requires = ligo-common m2crypto
release = 4
release = 3
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