Commit 7b449439 authored by Leo P. Singer's avatar Leo P. Singer
Browse files

Update to latest version of lalsuite / glue

See sccb/requests#76.
parent 94d6c74b
......@@ -5,7 +5,8 @@ Changelog
0.1.2 (unreleased)
==================
- No changes yet.
- Require lalsuite >6.53 and lscsoft-glue >=2.0.0 due to breaking changes in
API and behavior for LIGO-LW XML reading.
0.1.1 (2019-02-20)
==================
......
......@@ -132,7 +132,7 @@ Optionally, if you want to generate P-P plots, you need to convert the
``coinc.xml`` file to SQLite using the ``ligolw_sqlite`` tool from glue. Run
the following command::
ligolw_sqlite --preserve-ids --replace --database coinc.sqlite coinc.xml
ligolw_sqlite --ilwdchar-compat --preserve-ids --replace --database coinc.sqlite coinc.xml
The output is saved in SQLite format as ``coinc.sqlite``.
......
......@@ -103,7 +103,7 @@ def test_sqlite(tmpdir):
# Convert the test data to SQLite format in the temporary directory.
xmlfilename = os.path.join(DATA_PATH, '2016_subset.xml.gz')
dbfilename = str(tmpdir / '2016_subset.sqlite')
subprocess.check_call(['ligolw_sqlite', '-p',
subprocess.check_call(['ligolw_sqlite', '--ilwdchar-compat', '-p',
xmlfilename, '-d', dbfilename])
# Symbolicly link the PSD directory into the temporary directory.
......
......@@ -85,7 +85,8 @@ def coinc_without_inj(coinc, tmpdir):
@pytest.fixture
def coinc_sqlite(coinc, tmpdir):
filename = str(tmpdir / 'coinc.sqlite')
run_glue('ligolw_sqlite', coinc, '-p', '-r', '-d', filename)
run_glue('ligolw_sqlite', coinc, '--ilwdchar-compat',
'-p', '-r', '-d', filename)
return filename
......
......@@ -3,8 +3,8 @@ astropy-healpix>=0.3 # https://github.com/astropy/astropy-healpix/pull/106
astropy>=3.1
healpy
h5py
lalsuite>=6.49,<=6.52
lscsoft-glue<=1.60.0
lalsuite>=6.53
lscsoft-glue>=2.0.0
ligo-gracedb>=2.0.1
ligo-segments>=1.2.0
matplotlib>=2.1.0
......@@ -12,6 +12,7 @@ networkx
numpy>=1.14,!=1.15.3
pillow>=2.5.0
ptemcee
python-ligo-lw
reproject>=0.3.2
scipy>=0.14
seaborn>=0.8.0
......
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