Update glue dependence to 1.60.0, require ligo-segments

gwpy · Oct 16, 2018 · 0f414c0 · 0f414c0
1 parent 2b7aebc
commit 0f414c0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/omicron/const.py b/omicron/const.py
@@ -21,7 +21,7 @@
 
 import os
 
-from glue.segments import segment as Segment
+from ligo.segments import segment as Segment
 
 # -- generic parameters
 try:

diff --git a/omicron/data.py b/omicron/data.py
@@ -28,7 +28,7 @@
 
 from glue import datafind
 from glue.lal import (Cache, CacheEntry)
-from glue.segments import (segment as Segment, segmentlist as SegmentList)
+from ligo.segments import (segment as Segment, segmentlist as SegmentList)
 
 re_ll = re.compile('_(llhoft|lldetchar)\Z')
 re_gwf_gps_epoch = re.compile('[-\/](?P<gpsepoch>\d+)$')

diff --git a/omicron/segments.py b/omicron/segments.py
@@ -30,7 +30,7 @@
 
 from glue.lal import Cache
 from glue.segmentsUtils import fromsegwizard
-from glue.segments import (segmentlist as SegmentList, segment as Segment)
+from ligo.segments import (segmentlist as SegmentList, segment as Segment)
 
 from dqsegdb.urifunctions import getDataUrllib2 as dqsegdb_uri_query
 

diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,8 @@ six
 numpy
 pyOpenSSL
 pykerberos
-lscsoft-glue
+lscsoft-glue >= 1.60.0
+ligo-segments
 lalsuite
 dqsegdb
 gwpy

diff --git a/setup.py b/setup.py
@@ -50,7 +50,8 @@
 install_requires = [
     'six',
     'numpy',
-    'lscsoft-glue',
+    'lscsoft-glue >= 1.60.0',
+    'ligo-segments',
     'htcondor',
     'lalsuite',
     'dqsegdb',