gwpy 3.0.7__py3-none-any.whl → 3.0.9__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.7'
-__version_tuple__ = version_tuple = (3, 0, 7)
+__version__ = version = '3.0.9'
+__version_tuple__ = version_tuple = (3, 0, 9)

gwpy/astro/range.py

@@ -25,7 +25,7 @@ import warnings
 from functools import wraps
 from math import pi
 
-from scipy.integrate import trapz
+from scipy.integrate import trapezoid
 from scipy.interpolate import interp1d
 
 from astropy import (
@@ -238,7 +238,7 @@ def sensemon_range(psd, snr=8, mass1=1.4, mass2=1.4, fmin=None, fmax=None,
     integrand = sensemon_range_psd(psd[frange], snr=snr, mass1=mass1,
                                    mass2=mass2, horizon=horizon)
     return (units.Quantity(
-        trapz(integrand.value, f.value[frange]),
+        trapezoid(integrand.value, f.value[frange]),
         unit=integrand.unit * units.Hertz,
     ) ** (1/2.)).to('Mpc')
 
@@ -528,7 +528,7 @@ def burst_range(psd, snr=8, energy=1e-2, fmin=100, fmax=500):
     # calculate integrand and integrate
     integrand = burst_range_spectrum(
         psd[frange], snr=snr, energy=energy) ** 3
-    out = trapz(integrand.value, f[frange])
+    out = trapezoid(integrand.value, f[frange])
     # normalize and return
     return (units.Quantity(
         out / (fmax - fmin),

gwpy/astro/tests/test_range.py

@@ -24,7 +24,7 @@ from unittest import mock
 import pytest
 
 from astropy import units
-from scipy.integrate import trapz
+from scipy.integrate import trapezoid
 
 from ... import astro
 from ...testing import utils
@@ -71,7 +71,7 @@ def test_sensemon_range_psd(psd):
     r = astro.sensemon_range_psd(psd[frange])
     assert isinstance(r, FrequencySeries)
     utils.assert_quantity_almost_equal(
-        trapz(r, r.frequencies) ** (1/2.),
+        trapezoid(r, r.frequencies) ** (1/2.),
         TEST_RESULTS['sensemon_range'],
     )
     assert r.f0.value > 0
@@ -103,9 +103,8 @@ def test_inspiral_range_psd(psd):
     frange = (psd.frequencies.value < 4096)
     r = astro.inspiral_range_psd(psd[frange])
     assert isinstance(r, FrequencySeries)
-    print(trapz(r, r.frequencies) ** (1/2.))
     utils.assert_quantity_almost_equal(
-        trapz(r, r.frequencies) ** (1/2.),
+        trapezoid(r, r.frequencies) ** (1/2.),
         TEST_RESULTS['inspiral_range'],
     )
     assert r.f0.value > 0
@@ -129,7 +128,7 @@ def test_burst_range_spectrum(psd):
     r = astro.burst_range_spectrum(psd[frange])
     assert isinstance(r, FrequencySeries)
     utils.assert_quantity_almost_equal(
-        (trapz(r**3, f[frange]) / (400 * units.Hz)) ** (1/3.),
+        (trapezoid(r**3, f[frange]) / (400 * units.Hz)) ** (1/3.),
         TEST_RESULTS['burst_range'],
     )
     assert r.f0.value > 0

gwpy/cli/qtransform.py

@@ -215,7 +215,7 @@ class Qtransform(Spectrogram):
             outseg = Segment(gps, gps).protract(args.plot[self.plot_num])
 
             # use the precomputed ASD as the whitener if needed
-            if self.qxfrm_args.get("whiten"):
+            if self.qxfrm_args.get("whiten") is True:
                 self.qxfrm_args["whiten"] = asd
 
             # This section tries to optimize the amount of data that is

gwpy/detector/tests/test_units.py

@@ -39,6 +39,9 @@ __author__ = 'Duncan Macleod <duncan.macleod@ligo.org>'
     ('degrees_C', units.Unit('Celsius')),
     ('DegC', units.Unit('Celsius')),
     ('degrees_F', units.Unit('Fahrenheit')),
+    ('time', units.second),  # LIGO default time 'unit'
+    ('Time (sec)', units.second),  # Virgo default time 'unit'
+    ('Seconds', units.second),  # GWOSC default time 'unit'
 ])
 def test_parse_unit(arg, unit):
     assert parse_unit(arg, parse_strict='silent') == unit

gwpy/detector/units.py

@@ -161,9 +161,18 @@ units.add_enabled_units(units_imperial)
 # 1) alternative names
 registry = units.get_current_unit_registry().registry
 for unit, aliases in [
-        (units.Unit('ct'), ('counts',)),
-        (units.Unit('Celsius'), ('Degrees_C', 'DegC')),
-        (units.Unit('Fahrenheit'), ('Degrees_F', 'DegF')),
+    (units.Unit('ct'), ('counts',)),
+    (units.Unit('Celsius'), ('Degrees_C', 'DegC')),
+    (units.Unit('Fahrenheit'), ('Degrees_F', 'DegF')),
+    # GW observatories like to record 'time' as the unit
+    (units.Unit('second'), (
+        'time',
+        'time (s)',
+        'time [s]',
+        'Time [sec]',
+        'Time (sec)',
+        'Seconds',  # GWOSC
+    )),
 ]:
     unit.names.extend(aliases)
     for alias in aliases:

gwpy/frequencyseries/frequencyseries.py

@@ -227,10 +227,19 @@ class FrequencySeries(Series):
         # Undo normalization from TimeSeries.fft
         # The DC component does not have the factor of two applied
         # so we account for it here
-        dift = npfft.irfft(self.value * nout) / 2
-        new = TimeSeries(dift, epoch=self.epoch, channel=self.channel,
-                         unit=self.unit, dx=1/self.dx/nout)
-        return new
+        array = self.value.copy()
+        array[1:] /= 2.0
+        dift = npfft.irfft(
+            array * nout,
+            n=nout,
+        )
+        return TimeSeries(
+            dift,
+            epoch=self.epoch,
+            channel=self.channel,
+            unit=self.unit,
+            dx=(1/self.dx/nout).to(TimeSeries._default_xunit),
+        )
 
     def zpk(self, zeros, poles, gain, analog=True):
         """Filter this `FrequencySeries` by applying a zero-pole-gain filter

gwpy/io/cache.py

@@ -23,6 +23,7 @@ and associated metadata for those files, designed to make identifying
 relevant data, and sieving large file lists, easier for the user.
 """
 
+import contextlib
 import os
 import warnings
 from collections import (namedtuple, OrderedDict)
@@ -51,6 +52,27 @@ else:
 __author__ = 'Duncan Macleod <duncan.macleod@ligo.org>'
 
 
+@contextlib.contextmanager
+def _silence_lal_debug_warnings():
+    """Temporarily silence debug warnings from LAL.
+    """
+    try:
+        import lal
+    except ImportError:
+        yield
+        return
+
+    debuglevel = lal.GetDebugLevel()
+    # silence LAL debug warnings
+    lal.ClobberDebugLevel(0)
+
+    try:
+        yield
+    finally:
+        # reset
+        lal.ClobberDebugLevel(debuglevel)
+
+
 def _preformat_entry(entry):
     path = file_path(entry)
     obs, tag, seg = filename_metadata(path)
@@ -83,7 +105,8 @@ def _format_entry_ffl(entry):
 def _parse_entry_ffl(line, gpstype=LIGOTimeGPS):
     from ..segments import Segment
     path, start, dur, _, _ = line
-    start = gpstype(start)
+    with _silence_lal_debug_warnings():
+        start = gpstype(start)
     end = start + float(dur)
     try:
         observatory, description = os.path.basename(path).split('-', 2)[:2]

gwpy/io/datafind.py

@@ -65,6 +65,7 @@ GRB_TYPE = re.compile(r'^(?!.*_GRB\d{6}([A-Z])?$)')  # *_GRBYYMMDD{A}
 HIGH_PRIORITY_TYPE = re.compile("({})".format("|".join((
     r'\A[A-Z]\d_HOFT_C\d\d(_T\d{7}_v\d)?\Z',  # X1_HOFT_CXY
     r'\AV1Online\Z',
+    r'\AHoftOnline\Z',
     r'\AV1O[0-9]+([A-Z]+)?Repro[0-9]+[A-Z]+\Z',  # V1OXReproXY
 ))))
 LOW_PRIORITY_TYPE = re.compile("({})".format("|".join((

gwpy/io/ffldatafind.py

@@ -28,8 +28,9 @@ __author__ = "Duncan Macleod <duncan.macleod@ligo.org>"
 
 import os
 import re
-from warnings import warn
+from collections import defaultdict
 from functools import lru_cache
+from warnings import warn
 
 from ligo.segments import (
     segment,
@@ -37,8 +38,10 @@ from ligo.segments import (
 )
 
 from .cache import (
+    _CacheEntry,
     _iter_cache,
     cache_segments,
+    file_segment,
     read_cache_entry,
 )
 
@@ -123,10 +126,10 @@ def _find_ffl_files(basedir=None):
 def _find_ffls(basedir=None):
     """Find all readable FFL files.
     """
-    ffls = {}
+    ffls = defaultdict(list)
     for path in _find_ffl_files(basedir=basedir):
         try:
-            ffls[_get_site_tag(path)] = path
+            ffls[_get_site_tag(path)].append(path)
         except (
             OSError,  # file is empty (or cannot be read at all)
             AttributeError,  # last entry didn't match _SITE_REGEX
@@ -135,8 +138,8 @@ def _find_ffls(basedir=None):
     return ffls
 
 
-def _ffl_path(site, tag, basedir=None):
-    """Return the path of the FFL file for a given site and tag.
+def _ffl_paths(site, tag, basedir=None):
+    """Return the paths of all FFL files for a given site and tag.
     """
     try:
         return _find_ffls(basedir=basedir)[(site, tag)]
@@ -147,15 +150,18 @@ def _ffl_path(site, tag, basedir=None):
 
 
 @lru_cache()
-def _read_ffl(site, tag, basedir=None):
-    """Read an FFL file as a list of `CacheEntry` objects
+def _read_ffls(site, tag, basedir=None):
+    """Read all FFL files for a given site and tag
+    as a list of `CacheEntry` objects.
     """
-    ffl = _ffl_path(site, tag, basedir=basedir)
-    with open(ffl, "r") as fobj:
-        return [
-            type(entry)(site, tag, entry.segment, entry.path)
-            for entry in _iter_cache(fobj, gpstype=float)
-        ]
+    entries = []
+    for ffl in _ffl_paths(site, tag, basedir=basedir):
+        with open(ffl, "r") as fobj:
+            entries.extend(
+                _CacheEntry(site, tag, entry.segment, entry.path)
+                for entry in _iter_cache(fobj, gpstype=float)
+            )
+    return entries
 
 
 def _handle_error(action, message):
@@ -261,7 +267,7 @@ def find_urls(
     span = segment(gpsstart, gpsend)
 
     cache = [
-        e for e in _read_ffl(site, tag) if (
+        e for e in _read_ffls(site, tag) if (
             e.observatory == site
             and e.description == tag
             and e.segment.intersects(span)
@@ -305,11 +311,16 @@ def find_latest(site, tag, on_missing="warn"):
         for a specific site and tag.
     """
     try:
-        fflfile = _ffl_path(site, tag)
+        fflfiles = _ffl_paths(site, tag)
     except ValueError:  # no readable FFL file
         urls = []
     else:
-        urls = [read_cache_entry(_read_last_line(fflfile), gpstype=float)]
+        urls = [
+            read_cache_entry(_read_last_line(fflfile), gpstype=float)
+            for fflfile in fflfiles
+        ]
+        if urls:  # if multiple, find the latest one
+            urls = sorted(urls, key=file_segment)[-1:]
 
     if not urls:
         _handle_error(on_missing, "No files found")

gwpy/io/tests/test_ffldatafind.py

@@ -96,9 +96,11 @@ def test_is_ffl_file(path, result):
 # -- test ffl UI ------------
 
 FFLS = {
-    "test.ffl": [
+    "a/test.ffl": [
         "/tmp/X-test-0-1.gwf 0 1 0 0",
         "/tmp/X-test-1-1.gwf 1 1 0 0",
+    ],
+    "b/test.ffl": [
         "/tmp/X-test-2-1.gwf 2 1 0 0",
     ],
     "test2.ffl": [
@@ -114,7 +116,11 @@ FFLS = {
     "test-empty.ffl": [],
     "test-bad.ffl": ["badness"],
 }
-TEST_URLS = [x.split()[0] for x in FFLS["test.ffl"]]
+TEST_URLS = [
+    x.split()[0]
+    for key in ("a/test.ffl", "b/test.ffl")
+    for x in FFLS[key]
+]
 
 
 @pytest.fixture(autouse=True)
@@ -124,6 +130,7 @@ def mock_ffl(tmp_path):
     """
     for path, lines in FFLS.items():
         ffl = tmp_path / path
+        ffl.parent.mkdir(parents=True, exist_ok=True)
         ffl.write_text("\n".join(lines))
     with mock.patch.dict(
         "os.environ",
@@ -190,7 +197,7 @@ def test_find_latest():
     assert ffldatafind.find_latest(
         "X",
         "test",
-    ) == sorted(x.split()[0] for x in FFLS["test.ffl"])[-1:]
+    ) == sorted(x.split()[0] for x in FFLS["b/test.ffl"])[-1:]
 
 
 @pytest.mark.parametrize(("on_missing", "ctx"), (

gwpy/plot/gps.py

@@ -164,8 +164,13 @@ class GPSMixin(object):
         """
         if not self.unit:
             return None
-        name = sorted(self.unit.names, key=len)[-1]
-        return name + "s"  # pluralise
+        try:
+            name = self.unit.long_names[0]
+        except IndexError:
+            name = self.unit.name
+        if len(name) > 1:
+            return name + "s"  # pluralise for humans
+        return name
 
     def get_scale(self):
         """The scale (in seconds) of the current GPS unit.

gwpy/plot/tests/test_gps.py

@@ -79,6 +79,7 @@ class TestGPSMixin(object):
     @pytest.mark.parametrize('unit, name', [
         (None, None),
         ('second', 'seconds'),
+        (Unit('sday'), 'sdays'),  # no long_name
     ])
     def test_get_unit_name(self, unit, name):
         mix = self.TYPE(unit=unit)

gwpy/plot/tests/test_tex.py

@@ -39,6 +39,7 @@ def test_has_tex_missing_exe():
     """Test that `gwpy.plot.tex.has_tex` returns `False` when
     any one of the necessary executables is missing.
     """
+    plot_tex.has_tex.cache_clear()
     assert not plot_tex.has_tex()
 
 
@@ -47,6 +48,7 @@ def test_has_tex_bad_latex(_):
     """Test that `gwpy.plot.tex.has_tex` returns `False` when
     the LaTeX figure fails to render.
     """
+    plot_tex.has_tex.cache_clear()
     assert not plot_tex.has_tex()
 
 
@@ -57,6 +59,7 @@ def test_has_tex_true(_which_, _test_usetex):
     all of the necessary executables are found, and the LaTeX figure
     doesn't raise an exception.
     """
+    plot_tex.has_tex.cache_clear()
     assert plot_tex.has_tex()
 
 

gwpy/plot/tex.py

@@ -21,6 +21,7 @@
 """
 
 import re
+from functools import lru_cache
 from shutil import which
 
 __author__ = "Duncan Macleod <duncan.macleod@ligo.org>"
@@ -38,12 +39,15 @@ def _test_usetex():
     from matplotlib import (pyplot, rc_context)
     with rc_context({"text.usetex": True}):
         fig = pyplot.figure()
-        ax = fig.gca()
-        ax.set_xlabel(r"\LaTeX")
-        fig.canvas.draw()
-    pyplot.close(fig)
+        try:
+            ax = fig.gca()
+            ax.set_xlabel(r"\LaTeX")
+            fig.canvas.draw()
+        finally:
+            pyplot.close(fig)
 
 
+@lru_cache(maxsize=None)
 def has_tex():
     """Returns whether tex is installed on this system
 
@@ -69,8 +73,6 @@ def has_tex():
     return True
 
 
-HAS_TEX = has_tex()
-
 # -- tex formatting -----------------------------------------------------------
 
 LATEX_CONTROL_CHARS = ["%", "\\", "_", "~", "&", "#"]

gwpy/segments/flag.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) Louisiana State University (2014-2017)
-#               Cardiff University (2017-2021)
+#               Cardiff University (2017-2023)
 #
 # This file is part of GWpy.
 #
@@ -1263,12 +1263,19 @@ class DataQualityDict(OrderedDict):
 
         # parse a table into the target DataQualityDict
         def _parse_segments(table, listattr):
+            # handle missing *_ns columns in LIGO_LW XML
+            # (LIGO DMT doesn't/didn't write them)
+            if 'start_time_ns' in table.columnnames:
+                row_segment = operator.attrgetter("segment")
+            else:
+                row_segment = operator.attrgetter("start_time", "end_time")
+
             for row in table:
                 for flag in out:
                     # match row ID to list of IDs found for this flag
                     if int(row.segment_def_id) in id_[flag]:
                         getattr(out[flag], listattr).append(
-                            Segment(*map(gpstype, row.segment)),
+                            Segment(*map(gpstype, row_segment(row))),
                         )
                         break
 
@@ -1442,7 +1449,11 @@ class DataQualityDict(OrderedDict):
             if segments is None and source.netloc:
                 try:
                     tmp = {key: self[key].query(
-                        self[key].name, self[key].known, **kwargs)}
+                        self[key].name,
+                        self[key].known,
+                        url=source.geturl(),
+                        **kwargs,
+                    )}
                 except URLError as exc:
                     if on_error == 'ignore':
                         pass

gwpy/segments/tests/test_flag.py

@@ -76,6 +76,52 @@ def veto_definer(tmp_path):
     return tmp
 
 
+# -- XML without _ns columns --------------------------------------------------
+
+LIGOLW_NO_NS = """
+<?xml version="1.0"?>
+<!DOCTYPE LIGO_LW SYSTEM "http://ldas-sw.ligo.caltech.edu/doc/ligolwAPI/html/ligolw_dtd.txt">
+<LIGO_LW>
+  <Table Name="segment_definergroup:segment_definer:table">
+    <Column Name="segment_def_id" Type="int_8s"/>
+    <Column Name="ifos" Type="lstring"/>
+    <Column Name="name" Type="lstring"/>
+    <Column Name="version" Type="int_4s"/>
+    <Column Name="comment" Type="lstring"/>
+    <Stream Name="segment_definergroup:segment_definer:table" Type="Local" Delimiter=",">
+      0,"X1","TEST_FLAG",1,"Test flag",
+    </Stream>
+  </Table>
+  <Table Name="segment_summarygroup:segment_summary:table">
+    <Column Name="segment_sum_id" Type="int_8s"/>
+    <Column Name="start_time" Type="int_4s"/>
+    <Column Name="end_time" Type="int_4s"/>
+    <Column Name="comment" Type="lstring"/>
+    <Column Name="segment_definer:segment_def_id" Type="int_8s"/>
+    <Stream Name="segment_summarygroup:segment_summary:table" Type="Local" Delimiter=",">
+      0,1366644592,1366644608,"",0,
+    </Stream>
+  </Table>
+  <Table Name="segmentgroup:segment:table">
+    <Column Name="segment_id" Type="int_8s"/>
+    <Column Name="start_time" Type="int_4s"/>
+    <Column Name="end_time" Type="int_4s"/>
+    <Column Name="segment_definer:segment_def_id" Type="int_8s"/>
+    <Stream Name="segmentgroup:segment:table" Type="Local" Delimiter=",">
+      0,1366644592,1366644593,0,
+    </Stream>
+  </Table>
+</LIGO_LW>
+""".strip()  # noqa: E501
+
+
+@pytest.fixture
+def ligolw_no_ns(tmp_path):
+    tmp = tmp_path / "test.xml"
+    tmp.write_text(LIGOLW_NO_NS)
+    return tmp
+
+
 # -- test data ----------------------------------------------------------------
 
 def _as_segmentlist(*segments):
@@ -489,6 +535,13 @@ class TestDataQualityFlag(object):
         segdeftab = read_table(tmp, 'segment_definer')
         assert int(segdeftab[0].process_id) == 100
 
+    @pytest.mark.requires("ligo.lw.lsctables")
+    def test_read_ligolw_no_ns(self, ligolw_no_ns):
+        flag = self.TEST_CLASS.read(ligolw_no_ns, format="ligolw")
+        assert flag.name == "X1:TEST_FLAG:1"
+        assert flag.known == [(1366644592, 1366644608)]
+        assert flag.active == [(1366644592, 1366644593)]
+
     # -- test queries ---------------------------
 
     @mock.patch("gwpy.segments.flag.query_segments", mock_query_segments)

gwpy/signal/filter_design.py

@@ -30,6 +30,7 @@ from scipy import signal
 
 from astropy.units import (Unit, Quantity)
 
+from ..types.array import COPY_IF_NEEDED
 from .window import (get_window, planck)
 
 __author__ = "Duncan Macleod <duncan.macleod@ligo.org>"
@@ -89,7 +90,7 @@ def _design_fir(wp, ws, sample_rate, gpass, gstop, window='hamming', **kwargs):
         kwargs.setdefault('pass_zero', False)
     if ws.shape == (1,):
         kwargs.setdefault('width', ws - wp)
-    kwargs.setdefault('nyq', sample_rate/2.)
+    kwargs.setdefault('fs', sample_rate)
     return signal.firwin(nt, wp, window=window, **kwargs)
 
 
@@ -281,9 +282,9 @@ def bilinear_zpk(zeros, poles, gain, fs=1.0, unit='Hz'):
     zpk : `tuple`
         digital version of input zpk
     """
-    zeros = numpy.array(zeros, dtype=float, copy=False)
+    zeros = numpy.array(zeros, dtype=float, copy=COPY_IF_NEEDED)
     zeros = zeros[numpy.isfinite(zeros)]
-    poles = numpy.array(poles, dtype=float, copy=False)
+    poles = numpy.array(poles, dtype=float, copy=COPY_IF_NEEDED)
     gain = gain
 
     # convert from Hz to rad/s if needed

gwpy/signal/spectral/_lal.py

@@ -19,7 +19,7 @@
 """GWpy API to the LAL FFT routines
 
 See the `LAL TimeFreqFFT.h documentation
-<http://software.ligo.org/docs/lalsuite/lal/group___time_freq_f_f_t__h.html>`_
+<https://lscsoft.docs.ligo.org/lalsuite/lal/group___time_freq_f_f_t__h.html>`_
 for more details
 
 This module is deprecated and will be removed in a future release.

gwpy/signal/tests/test_coherence.py

@@ -33,7 +33,8 @@ from ...timeseries import TimeSeries
 def series_data():
     """Create some fake data with equal sampling frequencies.
 
-    Returns:
+    Returns
+    -------
         firstarr: an array of data, simple mixture of waves
         secondarr: a second array of data from different mixture
         seglen: segment length param to reuse for ffts
@@ -49,7 +50,7 @@ def series_data():
     firstarr += np.random.normal(5.8, 2, n_t)
 
     secondarr = 0.5 * np.cos(ts + 0.1) + 0.1 * np.sin(5 * ts + 10)
-    firstarr += np.random.normal(5.8, 2, n_t)
+    secondarr += np.random.normal(5.8, 2, n_t)
 
     return firstarr, secondarr, seglen
 
@@ -58,7 +59,8 @@ def series_data():
 def unequal_fs_series_data():
     """Create some fake data with unequal sampling frequencies.
 
-    Returns:
+    Returns
+    -------
         ts1: array of time points for first data array
         ts2: array of time points for second data array
         firstarr: an array of data, simple mixture of waves
@@ -67,7 +69,6 @@ def unequal_fs_series_data():
         fs_1: sampling frequency 1
         fs_2: sampling frequency 2
     """
-
     seglen = 512
     n_segs1 = 10
     n_segs2 = 20
@@ -92,7 +93,6 @@ def test_coherence_happy(series_data):
 
     For other tests see timeseries/tests/timeseries.py
     """
-
     firstarr, secondarr, seglen = series_data
     f_s = 0.001
 
@@ -108,8 +108,8 @@ def test_coherence_happy(series_data):
 
 
 def test_coherence_resample(unequal_fs_series_data):
-    """Ensure warning is raised by unequal sampling frequencies"""
-
+    """Ensure warning is raised by unequal sampling frequencies.
+    """
     ts1, ts2, firstarr, secondarr, seglen, fs_1, fs_2 = unequal_fs_series_data
 
     # first and second arrays are different, secondarr should have
@@ -137,8 +137,8 @@ def test_coherence_resample(unequal_fs_series_data):
 
 
 def test_coherence_resample_arg(series_data):
-    """Ensure warning is raised by unequal sampling frequencies"""
-
+    """Ensure warning is raised by unequal sampling frequencies.
+    """
     firstarr, secondarr, seglen = series_data
     f_s = 0.001
 

gwpy/signal/tests/test_filter_design.py

@@ -50,7 +50,7 @@ LOWPASS_IIR_100HZ = signal.iirdesign(
     analog=False, ftype='cheby1', output='zpk',
 )
 LOWPASS_FIR_100HZ = signal.firwin(
-    30, 100, window='hamming', width=50., nyq=512.,
+    30, 100, window='hamming', width=50., fs=1024.,
 )
 
 HIGHPASS_IIR_100HZ = signal.iirdesign(
@@ -60,7 +60,7 @@ HIGHPASS_IIR_100HZ = signal.iirdesign(
     analog=False, ftype='cheby1', output='zpk',
 )
 HIGHPASS_FIR_100HZ = signal.firwin(
-    45, 100, window='hamming', pass_zero=False, width=-100/3., nyq=512.,
+    45, 100, window='hamming', pass_zero=False, width=-100/3., fs=1024.,
 )
 
 BANDPASS_IIR_100HZ_200HZ = signal.iirdesign(
@@ -70,7 +70,7 @@ BANDPASS_IIR_100HZ_200HZ = signal.iirdesign(
     analog=False, ftype='cheby1', output='zpk',
 )
 BANDPASS_FIR_100HZ_200HZ = signal.firwin(
-    45, (100, 200.), window='hamming', pass_zero=False, nyq=512.,
+    45, (100, 200.), window='hamming', pass_zero=False, fs=1024.,
 )