gwpy 3.0.9__py3-none-any.whl → 3.0.11__py3-none-any.whl

gwpy/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.0.9'
-__version_tuple__ = version_tuple = (3, 0, 9)
+__version__ = version = '3.0.11'
+__version_tuple__ = version_tuple = (3, 0, 11)

gwpy/cli/gwpy_plot.py

@@ -55,7 +55,7 @@ Examples:
     $ gwpy-plot coherencegram --chan H1:GDS-CALIB_STRAIN H1:PEM-CS_ACC_PSL_PERISCOPE_X_DQ --start 1126260017 --duration 600
 
 Written by {__author__}.
-Report bugs to https://github.com/gwpy/gwpy/issues/.
+Report bugs to https://gitlab.com/gwpy/gwpy/-/issues/.
 """  # noqa: E501
 
 

gwpy/cli/tests/base.py

@@ -19,6 +19,7 @@
 """Unit tests for :mod:`gwpy.cli`
 """
 
+import warnings
 from argparse import ArgumentParser
 from unittest import mock
 
@@ -237,7 +238,16 @@ class _TestCliProduct(object):
         xmin = min(series.xspan[0] for series in data)
         xmax = max(series.xspan[1] for series in data)
 
-        plotprod.set_plot_properties()
+        # ignore warnings from matplotlib about having no labels
+        # (because we have cut some corners in preparing this test)
+        with warnings.catch_warnings():
+            warnings.filterwarnings(
+                "ignore",
+                message="No artists with labels found to put in legend",
+                category=UserWarning,
+            )
+            plotprod.set_plot_properties()
+
         ax = plotprod.ax
 
         ymin, ymax = ax.get_ylim()

gwpy/detector/units.py

@@ -187,7 +187,7 @@ units.def_unit(['NONE', 'undef'], namespace=_ns,
 
 # other dimenionless units
 units.def_unit('strain', namespace=_ns)
-units.def_unit('coherence', namespace=_ns)
+units.def_unit('coherence', represents=units.dimensionless_unscaled, namespace=_ns)
 
 # alias for 'second' but with prefices
 units.def_unit((['sec'], ['sec']), represents=units.second, prefixes=True,

gwpy/frequencyseries/tests/test_hist.py

@@ -77,7 +77,8 @@ class TestSpectralVariance(_TestArray2D):
         utils.assert_array_equal(array.yindex, array.bins[:-1])
 
     def test_transpose(self, array):
-        return NotImplemented
+        with pytest.raises(NotImplementedError):
+            array.T
 
     # -- test utilities -------------------------
 
@@ -110,10 +111,10 @@ class TestSpectralVariance(_TestArray2D):
         pytest.skip("float precision test not supported for SpectralVariance")
 
     def test_is_compatible_yindex(self, array):
-        return NotImplemented
+        pytest.skip(f"not implemented for {type(self).__name__}")
 
     def test_is_compatible_error_yindex(self, array):
-        return NotImplemented
+        pytest.skip(f"not implemented for {type(self).__name__}")
 
     def test_plot(self, array):
         with rc_context(rc={'text.usetex': False}):

gwpy/io/datafind.py

@@ -22,7 +22,7 @@ Automatic discovery of file paths for both LIGO and Virgo index solutions
 (``gwdatafind`` or ``ffl``, respectvely) is supported.
 
 The functions in this module are highly reliant on having local access to
-files (either directly, or via NFS, or CVMFS).
+files (either directly, or via NFS/fuse).
 
 Data discovery using the DataFind service requires the `gwdatafind` Python
 package (a dependency of ``gwpy``), and either the ``GW_DATAFIND_SERVER``
@@ -45,7 +45,7 @@ from unittest import mock
 
 import gwdatafind
 
-from ligo.segments import segment as LigoSegment
+from igwn_segments import segment as LigoSegment
 
 from ..time import to_gps
 from . import ffldatafind

gwpy/io/ffldatafind.py

@@ -32,7 +32,7 @@ from collections import defaultdict
 from functools import lru_cache
 from warnings import warn
 
-from ligo.segments import (
+from igwn_segments import (
     segment,
     segmentlist,
 )

gwpy/io/tests/test_datafind.py

@@ -27,7 +27,6 @@ import pytest
 import gwdatafind
 
 from ...testing.errors import (
-    pytest_skip_cvmfs_read_error,
     pytest_skip_network_error,
 )
 from ...testing.utils import (
@@ -76,30 +75,6 @@ def _mock_gwdatafind(func):
     return wrapper
 
 
-def _gwosc_gwdatafind(func):
-    """Decorate a function to use the GWOSC GWDataFind server.
-
-    That server returns paths from CVMFS (``/cvmfs/gwosc.osgstorage.org``) so
-    we need to add various protections.
-    """
-    @mock.patch.dict(  # point GWDataFind at GWOSC server
-        "os.environ",
-        {"GWDATAFIND_SERVER": "datafind.gwosc.org:80"},
-    )
-    @pytest_skip_cvmfs_read_error  # skip CVMFS problems
-    @pytest_skip_network_error  # skip network problems
-    @pytest.mark.skipif(  # skip missing CVMFS repo
-        not os.path.isdir('/cvmfs/gwosc.osgstorage.org/'),
-        reason="GWOSC CVMFS repository not available",
-    )
-    @pytest.mark.cvmfs  # mark test as requiring cvmfs
-    @pytest.mark.requires("LDAStools.frameCPP")  # skip if no frameCPP
-    def wrapper(*args, **kwargs):
-        return func(*args, **kwargs)
-
-    return wrapper
-
-
 # -- tests --------------------------------------------------------------------
 
 @mock.patch.dict("os.environ", clear=True)
@@ -207,34 +182,6 @@ def test_find_best_frametype():
     ) == 'HW100916'
 
 
-@_gwosc_gwdatafind
-def test_find_best_frametype_with_gaps():
-    """Test that `find_best_frametype` works across gaps.
-
-    It tries to find something that covers at least some of the gap.
-    """
-    assert io_datafind.find_best_frametype(
-        "L1:GWOSC-4KHZ_R1_STRAIN",
-        1187733504,
-        1187733504 + 4097,  # one second too long
-    ) == "L1_GWOSC_O2_4KHZ_R1"
-
-
-@_gwosc_gwdatafind
-def test_find_best_frametype_with_gaps_multiple():
-    """Test that `find_best_frametype` works across gaps with multiple
-    channels.
-    """
-    assert io_datafind.find_best_frametype(
-        ("L1:GWOSC-4KHZ_R1_STRAIN", "L1:GWOSC-4KHZ_R1_DQMASK"),
-        1187733504,
-        1187733504 + 4097,  # one second too long
-    ) == {
-        "L1:GWOSC-4KHZ_R1_STRAIN": "L1_GWOSC_O2_4KHZ_R1",
-        "L1:GWOSC-4KHZ_R1_DQMASK": "L1_GWOSC_O2_4KHZ_R1",
-    }
-
-
 @pytest.mark.requires("LDAStools.frameCPP")
 @pytest_skip_network_error
 @pytest.mark.skipif(

gwpy/plot/axes.py

@@ -39,6 +39,8 @@ from matplotlib.collections import PolyCollection
 from matplotlib.lines import Line2D
 from matplotlib.projections import register_projection
 
+from packaging.version import Version
+
 from . import (Plot, colorbar as gcbar)
 from .colors import format_norm
 from .gps import GPS_SCALES
@@ -47,6 +49,8 @@ from ..time import to_gps
 
 __author__ = 'Duncan Macleod <duncan.macleod@ligo.org>'
 
+matplotlib_version = Version(matplotlib_version)
+
 
 def log_norm(func):
     """Wrap ``func`` to handle custom gwpy keywords for a LogNorm colouring
@@ -86,7 +90,7 @@ def restore_grid(func):
     automatically removed a grid on a set of Axes. This decorator just
     undoes that.
     """
-    if matplotlib_version >= "3.7.0":
+    if matplotlib_version >= Version("3.7.0"):
         return func
 
     @wraps(func)
@@ -162,7 +166,7 @@ class Axes(_Axes):
         super().__init__(*args, **kwargs)
 
         # handle Series in `ax.plot()`
-        if matplotlib_version >= "3.8.0":
+        if matplotlib_version >= Version("3.8.0"):
             self._get_lines = PlotArgsProcessor()
         else:
             self._get_lines = PlotArgsProcessor(self)

gwpy/plot/plot.py

@@ -27,7 +27,12 @@ from itertools import zip_longest
 
 import numpy
 
-from matplotlib import (figure, get_backend, _pylab_helpers)
+from matplotlib import (
+    _pylab_helpers,
+    backends,
+    figure,
+    get_backend,
+)
 from matplotlib.artist import setp
 from matplotlib.gridspec import GridSpec
 from matplotlib.ticker import LogFormatterSciNotation
@@ -53,7 +58,12 @@ iterable_types = (list, tuple, KeysView, ValuesView,)
 def interactive_backend():
     """Returns `True` if the current backend is interactive
     """
-    from matplotlib.rcsetup import interactive_bk
+    try:
+        interactive_bk = backends.backend_registry.list_builtin(
+            backends.BackendFilter.INTERACTIVE,
+        )
+    except AttributeError:  # matplotlib < 3.9.0
+        from matplotlib.rcsetup import interactive_bk
     return get_backend() in interactive_bk
 
 

gwpy/plot/segments.py

@@ -27,7 +27,7 @@ from matplotlib.projections import register_projection
 from matplotlib.collections import PatchCollection
 from matplotlib.patches import Rectangle
 
-import ligo.segments
+import igwn_segments
 
 from .axes import Axes
 from .colors import tint
@@ -44,10 +44,10 @@ class SegmentAxes(Axes):
     This `SegmentAxes` provides custom methods for displaying any of
 
     - `~gwpy.segments.DataQualityFlag`
-    - `~gwpy.segments.Segment` or :class:`ligo.segments.segment`
-    - `~gwpy.segments.SegmentList` or :class:`ligo.segments.segmentlist`
+    - `~gwpy.segments.Segment` or :class:`igwn_segments.segment`
+    - `~gwpy.segments.SegmentList` or :class:`igwn_segments.segmentlist`
     - `~gwpy.segments.SegmentListDict` or
-      :class:`ligo.segments.segmentlistdict`
+      :class:`igwn_segments.segmentlistdict`
 
     Parameters
     ----------
@@ -84,9 +84,9 @@ class SegmentAxes(Axes):
             return self.plot_dict
         if isinstance(obj, DataQualityFlag):
             return self.plot_flag
-        if isinstance(obj, ligo.segments.segmentlistdict):
+        if isinstance(obj, igwn_segments.segmentlistdict):
             return self.plot_segmentlistdict
-        if isinstance(obj, ligo.segments.segmentlist):
+        if isinstance(obj, igwn_segments.segmentlist):
             return self.plot_segmentlist
         raise TypeError(
             f"no known {type(self).__name__}.plot_xxx method "
@@ -106,7 +106,7 @@ class SegmentAxes(Axes):
                 - `~gwpy.segments.SegmentList`
                 - `~gwpy.segments.SegmentListDict`
 
-            or equivalent types upstream from :mod:`ligo.segments`
+            or equivalent types upstream from :mod:`igwn_segments`
 
         kwargs
             keyword arguments applicable to `~matplotib.axes.Axes.plot`
@@ -442,7 +442,7 @@ class SegmentFormatter(Formatter):
         for patch in self.axis.axes.patches:
             if not patch.get_label() or patch.get_label() == '_nolegend_':
                 continue
-            if t in ligo.segments.segment(*patch.get_bbox().intervaly):
+            if t in igwn_segments.segment(*patch.get_bbox().intervaly):
                 return patch.get_label()
         return ''
 

gwpy/plot/tests/test_axes.py

@@ -24,16 +24,18 @@ import pytest
 import numpy
 
 from matplotlib import (
-    __version__ as matplotlib_version,
     rcParams,
 )
 from matplotlib.collections import PolyCollection
 from matplotlib.lines import Line2D
 
+from packaging.version import Version
+
 from ...time import to_gps
 from ...types import (Series, Array2D)
 from ...testing import utils
 from .. import Axes
+from ..axes import matplotlib_version
 from .utils import AxesTestBase
 
 numpy.random.seed(0)
@@ -172,7 +174,7 @@ class TestAxes(AxesTestBase):
         array = Array2D(numpy.random.random((10, 10)), dx=.1, dy=.2)
         ax.grid(True, which="both", axis="both")
         mesh = ax.pcolormesh(array)
-        if matplotlib_version >= "3.8.0":
+        if matplotlib_version >= Version("3.8.0"):
             utils.assert_array_equal(mesh.get_array(), array.T)
         else:  # matplotlib < 3.8.0
             utils.assert_array_equal(mesh.get_array(), array.T.flatten())

gwpy/plot/tests/test_segments.py

@@ -136,7 +136,7 @@ class TestSegmentAxes(_TestAxes):
     # -- disable tests from upstream
 
     def test_imshow(self):
-        return NotImplemented
+        pytest.skip(f"not implemented for {type(self).__name__}")
 
 
 def test_segmentrectangle():

gwpy/segments/__init__.py

@@ -19,7 +19,7 @@
 """This module provides classes for generating and manipulating
 data segments of the form [gps_start, gps_end).
 
-The core of this module is adapted from |ligo-segments|_.
+The core of this module is adapted from |igwn-segments|_.
 """
 
 from .segments import (Segment, SegmentList, SegmentListDict)

gwpy/segments/flag.py

@@ -453,18 +453,20 @@ class DataQualityFlag(object):
         Examples
         --------
         >>> from gwpy.segments import DataQualityFlag
-        >>> print(DataQualityFlag.fetch_open_data('H1_DATA', 'Jan 1 2010',
-        ...                                       'Jan 2 2010'))
+        >>> print(DataQualityFlag.fetch_open_data(
+        ...     "H1_DATA",
+        ...     "Sep 14 2015",
+        ...     "Sep 15 2015",
+        ... ))
         <DataQualityFlag('H1:DATA',
-                         known=[[946339215 ... 946425615)],
-                         active=[[946340946 ... 946351800)
-                                 [946356479 ... 946360620)
-                                 [946362652 ... 946369150)
-                                 [946372854 ... 946382630)
-                                 [946395595 ... 946396751)
-                                 [946400173 ... 946404977)
-                                 [946412312 ... 946413577)
-                                 [946415770 ... 946422986)],
+                         known=[[1126224017 ... 1126310417)]
+                         active=[[1126251604 ... 1126252133)
+                                 [1126252291 ... 1126274322)
+                                 [1126276234 ... 1126281754)
+                               ...
+                                 [1126308670 ... 1126309577)
+                                 [1126309637 ... 1126309817)
+                                 [1126309877 ... 1126310417)]
                          description=None)>
         """
         start = to_gps(start).gpsSeconds

gwpy/segments/io/hdf5.py

@@ -306,7 +306,7 @@ def write_hdf5_segmentlist(seglist, output, path=None, **kwargs):
 
     Parameters
     ----------
-    seglist : :class:`~ligo.segments.segmentlist`
+    seglist : :class:`~igwn_segments.segmentlist`
         data to write
 
     output : `str`, `h5py.File`, `h5py.Group`

gwpy/segments/segments.py

@@ -24,7 +24,7 @@ configuration.
 
 from astropy.io import registry as io_registry
 
-from ligo.segments import (segment, segmentlist, segmentlistdict)
+from igwn_segments import (segment, segmentlist, segmentlistdict)
 
 from ..io.mp import read_multi as io_read_multi
 from ..utils.decorators import return_as

gwpy/signal/filter_design.py

@@ -89,7 +89,7 @@ def _design_fir(wp, ws, sample_rate, gpass, gstop, window='hamming', **kwargs):
     if wp[0] > ws[0]:
         kwargs.setdefault('pass_zero', False)
     if ws.shape == (1,):
-        kwargs.setdefault('width', ws - wp)
+        kwargs.setdefault("width", ws.item() - wp.item())
     kwargs.setdefault('fs', sample_rate)
     return signal.firwin(nt, wp, window=window, **kwargs)
 

gwpy/signal/tests/test_coherence.py

@@ -21,6 +21,8 @@
 
 __author__ = "Alex Southgate <alex.southgate@ligo.org>"
 
+import warnings
+
 import numpy as np
 import pytest
 import scipy.signal as sig
@@ -121,7 +123,11 @@ def test_coherence_resample(unequal_fs_series_data):
     # the first coherence val coh12 is broken intentionally since
     # secondarr data should not have fs_1, instead fs_2
     coh12 = spectral.coherence(first, second, segmentlength=seglen)
-    coh13 = spectral.coherence(first, third, segmentlength=seglen)
+    with pytest.warns(
+        UserWarning,
+        match="Sampling frequencies are unequal",
+    ):
+        coh13 = spectral.coherence(first, third, segmentlength=seglen)
 
     # get the frequency at minimum coherence, this should be the extra
     # component in secondarr
@@ -136,7 +142,7 @@ def test_coherence_resample(unequal_fs_series_data):
     assert not (4 <= maxf12.value <= 6)
 
 
-def test_coherence_resample_arg(series_data):
+def test_coherence_resample_downsample(series_data):
     """Ensure warning is raised by unequal sampling frequencies.
     """
     firstarr, secondarr, seglen = series_data
@@ -145,15 +151,30 @@ def test_coherence_resample_arg(series_data):
     first = TimeSeries(firstarr, sample_rate=f_s)
     second = TimeSeries(secondarr, sample_rate=f_s * 2.32)
 
-    with pytest.warns(UserWarning, match="Sampling frequencies are unequal"):
-        spectral.coherence(first, second, segmentlength=seglen)
+    with pytest.warns(
+        UserWarning,
+        match="Sampling frequencies are unequal",
+    ):
+        coh1 = spectral.coherence(first, second, segmentlength=seglen)
 
+    # check that forcibly disabling downsample results in an error
     with pytest.raises(ValueError):
-        spectral.coherence(first, second, segmentlength=seglen,
-                           downsample=False)
-
-    coh1 = spectral.coherence(first, second, segmentlength=seglen)
-    coh2 = spectral.coherence(first, second, segmentlength=seglen,
-                              downsample=True)
+        spectral.coherence(
+            first,
+            second,
+            segmentlength=seglen,
+            downsample=False,
+        )
+
+    # but that accepting downsampling gives you the same result as
+    # doing nothing (but doesn't emit a warning)
+    with warnings.catch_warnings():
+        warnings.simplefilter("error", DeprecationWarning)
+        coh2 = spectral.coherence(
+            first,
+            second,
+            segmentlength=seglen,
+            downsample=True,
+        )
 
     assert all(np.array(coh1.data) == np.array(coh2.data))

gwpy/table/io/ligolw.py

@@ -58,7 +58,7 @@ try:
 except ImportError:
     pass
 else:
-    NUMPY_TYPE_MAP[LIGOTimeGPS] = numpy.float_
+    NUMPY_TYPE_MAP[LIGOTimeGPS] = numpy.float64
 
 
 # -- utilities ----------------------------------------------------------------

gwpy/table/tests/test_io_ligolw.py

@@ -70,7 +70,7 @@ def test_to_astropy_table_empty():
     tab = EventTable(llwtable, columns=["peak", "ifo"])
     assert set(tab.colnames) == {"peak", "ifo"}
     assert tab['peak'].dtype.type is numpy.object_
-    assert tab['ifo'].dtype.type is numpy.unicode_
+    assert tab['ifo'].dtype.type is numpy.str_
 
 
 @pytest.mark.requires("ligo.lw.lsctables")

gwpy/testing/errors.py

@@ -31,6 +31,7 @@ import requests.exceptions
 NETWORK_ERROR = (
     ConnectionError,
     requests.exceptions.ConnectionError,
+    requests.exceptions.ReadTimeout,
     socket.timeout,
     SSLError,
     URLError,

gwpy/testing/marks.py

@@ -29,7 +29,7 @@ registered up front and visible via ``python -m pytest gwpy --markers``.
 """
 
 MARKS = {
-    "cvmfs": "mark a test as requiring CVMFS",
+    # nothing here, used to support 'cvmfs' but that was removed
 }
 
 

gwpy/timeseries/core.py

@@ -793,7 +793,6 @@ class TimeSeriesBase(Series):
                 op_ = ufunc.__name__
             out = out.view(StateTimeSeries)
             out.__metadata_finalize__(orig)
-            out.override_unit('')
             oname = orig.name if isinstance(orig, type(self)) else orig
             vname = value.name if isinstance(value, type(self)) else value
             out.name = '{0!s} {1!s} {2!s}'.format(oname, op_, vname)

gwpy/timeseries/io/gwf/__init__.py

@@ -38,7 +38,7 @@ import numpy
 
 from astropy.io.registry import (get_reader, get_writer)
 
-from ligo.segments import segment as LigoSegment
+from igwn_segments import segment as LigoSegment
 
 from ....time import to_gps
 from ....io.gwf import identify_gwf

gwpy/timeseries/statevector.py

@@ -184,8 +184,10 @@ class StateTimeSeries(TimeSeriesBase):
     def unit(self):
         return units.dimensionless_unscaled
 
-    def override_unit(self, unit, parse_strict='raise'):
-        return NotImplemented
+    def override_unit(self, *args, **kwargs):
+        raise NotImplementedError(
+            f"overriding units is not supported for {type(self).__name__}",
+        )
 
     def _to_own_unit(self, value, check_precision=True):
         if isinstance(value, units.Quantity) and value.unit != self.unit:

gwpy/timeseries/tests/test_core.py

@@ -53,7 +53,8 @@ class TestTimeSeriesBase(_TestSeries):
     def test_new(self):
         """Test `gwpy.timeseries.TimeSeriesBase` constructor
         """
-        array = super().test_new()
+        array = self.create()
+        super().test_new()
 
         # check time-domain metadata
         assert array.epoch == GPS_EPOCH
@@ -145,7 +146,7 @@ class TestTimeSeriesBase(_TestSeries):
     def test_sample_rate_ghz(self, array):
         """Test that very large sample rates don't get rounded to dt=0.
 
-        Regression: https://github.com/gwpy/gwpy/issues/1646
+        Regression: https://gitlab.com/gwpy/gwpy/-/issues/1646
         """
         array.sample_rate = 1e9
         assert array.dt.value > 0.
@@ -400,20 +401,13 @@ class TestTimeSeriesBaseDict(object):
 
     def test_resample(self, instance):
         if self.ENTRY_CLASS is TimeSeriesBase:  # currently only for subclasses
-            return NotImplemented
+            pytest.skip(f"not implemented for {type(instance).__name__}")
+
+        # for all subclasses
         a = instance.resample(.5)
         for key in a:
             assert a[key].dx == 1/.5 * a[key].xunit
 
-    def test_fetch(self):
-        return NotImplemented
-
-    def test_find(self):
-        return NotImplemented
-
-    def test_get(self):
-        return NotImplemented
-
     @pytest.mark.requires("nds2")
     def test_from_nds2_buffers(self):
         buffers = [
@@ -445,7 +439,7 @@ class TestTimeSeriesBaseDict(object):
     def test_plot_separate(self, instance):
         """Test plotting `TimeSeriesDict` on separate axes.
 
-        See https://github.com/gwpy/gwpy/issues/1609
+        See https://gitlab.com/gwpy/gwpy/-/issues/1609
         """
         with rc_context(rc={'text.usetex': False}):
             plot = instance.plot(separate=True)

gwpy/timeseries/tests/test_io_gwf_framecpp.py

@@ -63,7 +63,7 @@ def test_read_scaled_type_change(int32ts, tmp_path):
 
 
 def test_read_write_frvect_name(tmp_path):
-    """Test against regression of https://github.com/gwpy/gwpy/issues/1206
+    """Test against regression of https://gitlab.com/gwpy/gwpy/-/issues/1206
     """
     data = TimeSeries(
         numpy.random.random(10),