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

Update glue dependence to 1.60.0, require ligo-segments #71

Merged
merged 1 commit into from
Nov 5, 2018
Merged

Update glue dependence to 1.60.0, require ligo-segments #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 omicron/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import os

from glue.segments import segment as Segment
from ligo.segments import segment as Segment

# -- generic parameters
try:
Expand Down
2 changes: 1 addition & 1 deletion omicron/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+)$')
Expand Down
2 changes: 1 addition & 1 deletion omicron/segments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ six
numpy
pyOpenSSL
pykerberos
lscsoft-glue
lscsoft-glue >= 1.60.0
ligo-segments
lalsuite
dqsegdb
gwpy
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
install_requires = [
'six',
'numpy',
'lscsoft-glue',
'lscsoft-glue >= 1.60.0',
'ligo-segments',
'htcondor',
'lalsuite',
'dqsegdb',
Expand Down