diff --git a/omicron/const.py b/omicron/const.py index 0a892cf..9f39088 100644 --- 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 index 67a268f..a5c678d 100644 --- 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\d+)$') diff --git a/omicron/segments.py b/omicron/segments.py index 2eb29ca..f45cb9a 100644 --- 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 index c5893f0..204e3b9 100644 --- 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 index e0c00bf..1f26335 100644 --- 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',