Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated references to lscsoft-glue #92

Merged
merged 3 commits into from
Mar 17, 2019
Merged

Updated references to lscsoft-glue #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de216f9
omicron-status: use MarkupPy to provide markup.py
duncanmmacleod Mar 17, 2019
f1dd9e7
omicron.segments: don't use glue.lal.Cache
duncanmmacleod Mar 17, 2019
dda3f82
requirements: cleaned up dependencies
duncanmmacleod Mar 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/omicron-status
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions omicron/segments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down
18 changes: 8 additions & 10 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
16 changes: 8 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down