Merge dda3f82 into cc03482

gwpy · Mar 17, 2019 · 34e644a · 34e644a
2 parents cc03482 + dda3f82
commit 34e644a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/bin/omicron-status b/bin/omicron-status
@@ -47,7 +47,7 @@ from matplotlib.gridspec import GridSpec
 
 import h5py
 
-from glue import markup
+from MarkupPy import markup
 
 from gwpy.io.cache import sieve as sieve_cache
 from gwpy.time import to_gps

diff --git a/omicron/segments.py b/omicron/segments.py
@@ -26,8 +26,6 @@
 from math import (floor, ceil)
 from functools import wraps
 
-from glue.lal import Cache
-
 from dqsegdb2.query import DEFAULT_SEGMENT_SERVER
 from dqsegdb2.http import request as dqsegdb2_request
 
@@ -284,7 +282,7 @@ def get_latest_known_gps(flag, url=DEFAULT_SEGMENT_SERVER):
 def cache_overlaps(*caches):
     """Find segments of overlap in the given cache sets
     """
-    cache = Cache(e for c in caches for e in c)
+    cache = [e for c in caches for e in c]
     cache.sort(key=lambda e: file_segment(e)[0])
     overlap = SegmentList()
     segments = SegmentList()

diff --git a/requirements.txt b/requirements.txt
@@ -1,14 +1,12 @@
-six
-numpy
-pyOpenSSL
-pykerberos
-lscsoft-glue >= 1.60.0
-python-ligo-lw >= 1.4.0
-ligo-segments
-lalsuite
 dqsegdb2
+gwdatafind
 gwpy >=0.14.0
-htcondor
 h5py
-gwdatafind
+htcondor
+ligo-segments
+lscsoft-glue >= 1.60.0
+MarkupPy
+numpy
+python-ligo-lw >= 1.4.0
+six
 pytest
diff --git a/setup.py b/setup.py
@@ -48,17 +48,17 @@
     'setuptools',
 ]
 install_requires = [
-    'six',
-    'numpy',
-    'lscsoft-glue >= 1.60.0',
-    'ligo-segments',
-    'htcondor',
-    'lalsuite',
     'dqsegdb2',
+    'gwdatafind',
     'gwpy >= 0.14.0',
-    'python-ligo-lw >= 1.4.0',
     'h5py',
-    'gwdatafind',
+    'htcondor',
+    'ligo-segments',
+    'lscsoft-glue >= 1.60.0',
+    'MarkupPy',
+    'numpy',
+    'python-ligo-lw >= 1.4.0',
+    'six',
 ]
 tests_require = [
     'pytest',