gwsumm 2.2.3__tar.gz → 2.2.4__tar.gz

{gwsumm-2.2.3 → gwsumm-2.2.4}/.github/workflows/build.yml

@@ -49,12 +49,12 @@ jobs:
 
     steps:
     - name: Get source code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Cache conda packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       env:
         # increment to reset cache
         CACHE_NUMBER: 0
@@ -64,14 +64,12 @@ jobs:
         restore-keys: ${{ runner.os }}-conda-${{ matrix.python-version }}-
 
     - name: Configure conda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         activate-environment: test
         miniforge-variant: Mambaforge
         python-version: ${{ matrix.python-version }}
         use-mamba: true
-        # this is needed for caching to work properly:
-        use-only-tar-bz2: true
 
     - name: Conda info
       run: conda info --all
@@ -113,14 +111,14 @@ jobs:
       run: python -m coverage report --show-missing
 
     - name: Publish coverage to Codecov
-      uses: codecov/codecov-action@v1.2.1
+      uses: codecov/codecov-action@v4
       with:
         files: coverage.xml
         flags: ${{ runner.os }},python${{ matrix.python-version }}
 
     - name: Upload test results
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: pytest-conda-${{ matrix.os }}-${{ matrix.python-version }}
         path: pytest.xml

{gwsumm-2.2.3 → gwsumm-2.2.4}/.github/workflows/lint.yml

@@ -27,9 +27,9 @@ jobs:
     name: Flake8
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies

{gwsumm-2.2.3 → gwsumm-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gwsumm
-Version: 2.2.3
+Version: 2.2.4
 Summary: A python toolbox used by the LIGO Scientific Collaboration for detector characterisation
 Author-email: Alex Urban <alex.urban@ligo.org>, Duncan Macleod <duncan.macleod@ligo.org>
 Maintainer-email: Evan Goetz <evan.goetz@ligo.org>
@@ -28,7 +28,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: astropy>=3.0.0
 Requires-Dist: gwdatafind>=1.1.1
-Requires-Dist: gwdetchar>=2.0.0
+Requires-Dist: gwdetchar>=2.2.4
 Requires-Dist: gwpy>=2.0.0
 Requires-Dist: gwtrigfind
 Requires-Dist: lalsuite

{gwsumm-2.2.3 → gwsumm-2.2.4}/docs/environment.yml

@@ -28,6 +28,6 @@ dependencies:
   # docs
   - numpydoc
   - sphinx
-  - sphinx-automodapi
+  - sphinx-automodapi !=0.17.0
   - sphinx_bootstrap_theme
-  - sphinxcontrib-programoutput
+  - sphinxcontrib-programoutput

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.3'
-__version_tuple__ = version_tuple = (2, 2, 3)
+__version__ = version = '2.2.4'
+__version_tuple__ = version_tuple = (2, 2, 4)

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/data/range.py

@@ -117,21 +117,37 @@ def get_range_spectrogram(channel, segments, config=None, cache=None,
             add_spectrogram(outspec if 'energy' in rangekwargs else
                             outspec**(1/2.), key=key)
 
-    if return_:
-        return globalv.SPECTROGRAMS.get(key, SpectrogramList())
+    if not return_:
+        return
+
+    # return correct data, according to state segment
+    out = SpectrogramList()
+    for specgram in globalv.SPECTROGRAMS[key]:
+        for seg in segments:
+            if abs(seg) < specgram.dt.value:
+                continue
+            if specgram.span.intersects(seg):
+                common = specgram.span & type(seg)(seg[0],
+                                                   seg[1] + specgram.dt.value)
+                s = specgram.crop(*common)
+                if s.shape[0]:
+                    out.append(s)
+    return out.coalesce()
 
 
 @use_segmentlist
 def get_range_spectrum(channel, segments, config=None, cache=None, query=True,
                        nds=None, return_=True, nproc=1, datafind_error='raise',
                        frametype=None, stride=60, fftlength=None, overlap=None,
-                       method=None, which='all', **rangekwargs):
+                       method=None, which='all', state=None, **rangekwargs):
     """Compute percentile spectra of the range integrand from a set of
     spectrograms
     """
     name = str(channel)
-    cmin = '%s.min' % name
-    cmax = '%s.max' % name
+    if state:
+        name += f',{state}'
+    cmin = f'{name}.min'
+    cmax = f'{name}.max'
 
     if name not in globalv.SPECTRUM:
         speclist = get_range_spectrogram(
@@ -164,4 +180,4 @@ def get_range_spectrum(channel, segments, config=None, cache=None, query=True,
         return globalv.SPECTRUM[cmin]
     if which == 'max':
         return globalv.SPECTRUM[cmax]
-    raise ValueError("Unrecognised value for `which`: %r" % which)
+    raise ValueError(f"Unrecognised value for `which`: {which}")

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/data/spectral.py

@@ -34,7 +34,6 @@ from scipy import interpolate
 
 from astropy import units
 
-from gwpy.segments import DataQualityFlag
 from gwpy.frequencyseries import FrequencySeries
 from gwpy.spectrogram import SpectrogramList
 
@@ -328,17 +327,11 @@ def apply_transfer_function_series(specgram, tfunc):
 def get_spectrum(channel, segments, config=None, cache=None,
                  query=True, nds=None, format='power', return_=True,
                  frametype=None, nproc=1, datafind_error='raise',
-                 **fftparams):
-    """Retrieve the time-series and generate a spectrogram of the given
+                 state=None, **fftparams):
+    """Retrieve the time-series and generate a spectrum of the given
     channel
     """
     channel = get_channel(channel)
-    if isinstance(segments, DataQualityFlag):
-        name = ','.join([channel.ndsname, segments.name])
-        segments = segments.active
-    else:
-        name = channel.ndsname
-    name += ',%s' % format
 
     # read data for all sub-channels
     specs = []
@@ -351,6 +344,7 @@ def get_spectrum(channel, segments, config=None, cache=None,
                                    return_=return_, frametype=frametype,
                                    nproc=nproc,
                                    datafind_error=datafind_error,
+                                   state=state,
                                    **fftparams))
     if return_ and len(channels) == 1:
         return specs[0]
@@ -363,19 +357,17 @@ def get_spectrum(channel, segments, config=None, cache=None,
 
 def _get_spectrum(channel, segments, config=None, cache=None, query=True,
                   nds=None, format='power', return_=True, which='all',
-                  **fftparams):
-    """Retrieve the time-series and generate a spectrogram of the given
+                  state=None, **fftparams):
+    """Retrieve the time-series and generate a spectrum of the given
     channel
     """
     channel = get_channel(channel)
-    if isinstance(segments, DataQualityFlag):
-        name = ','.join([channel.ndsname, segments.name])
-        segments = segments.active
-    else:
-        name = channel.ndsname
-    name += ',%s' % format
-    cmin = '%s.min' % name
-    cmax = '%s.max' % name
+
+    name = f'{channel.ndsname},{format}'
+    if state:
+        name = f'{channel.ndsname},{state},{format}'
+    cmin = f'{name}.min'
+    cmax = f'{name}.max'
 
     if name not in globalv.SPECTRUM:
         if os.path.isfile(channel.ndsname):
@@ -424,4 +416,4 @@ def _get_spectrum(channel, segments, config=None, cache=None, query=True,
         return globalv.SPECTRUM[cmin]
     if which == 'max':
         return globalv.SPECTRUM[cmax]
-    raise ValueError("Unrecognised value for `which`: %r" % which)
+    raise ValueError(f"Unrecognised value for `which`: {which}")

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/html/bootstrap.py

@@ -150,9 +150,9 @@ def state_switcher(states, default=0):
     page.li(class_='nav-item dropdown')
     page.a(str(current), class_='nav-link dropdown-toggle', href='#',
            id_='states', role='button', title='Show/hide state menu',
-           **{'data-toggle': 'dropdown'})
+           **{'data-bs-toggle': 'dropdown'})
     page.div(
-        class_='dropdown-menu dropdown-menu-right state-switch shadow',
+        class_='dropdown-menu dropdown-menu-end state-switch shadow',
         id_='statemenu',
     )
     page.h6('Select below to view this page in another state (different '

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/html/static.py

@@ -24,33 +24,34 @@ This module mainly declares the resources used by standard on HTML pages
 from collections import OrderedDict
 
 __author__ = 'Duncan Macleod <duncan.macleod@ligo.org>'
-__credits__ = 'Alex Urban <alexander.urban@ligo.org>'
+__credits__ = ('Alex Urban <alexander.urban@ligo.org>,'
+               ' Evan Goetz <evan.goetz@ligo.org>')
 
 
 # build collection of CSS resources
 CSS = OrderedDict((
     ('font-awesome', 'https://cdnjs.cloudflare.com/ajax/libs/'
-                     'font-awesome/5.15.1/css/fontawesome.min.css'),
+                     'font-awesome/6.5.1/css/fontawesome.min.css'),
     ('font-awesome-solid', 'https://cdnjs.cloudflare.com/ajax/libs/'
-                           'font-awesome/5.15.1/css/solid.min.css'),
-    ('gwbootstrap', 'https://cdn.jsdelivr.net/npm/gwbootstrap@1.3.2/'
+                           'font-awesome/6.5.1/css/solid.min.css'),
+    ('gwbootstrap', 'https://cdn.jsdelivr.net/npm/gwbootstrap@1.3.4/'
                     'lib/gwbootstrap.min.css'),
 ))
 
 # build collection of javascript resources
 JS = OrderedDict((
-    ('jquery', 'https://code.jquery.com/jquery-3.5.1.min.js'),
-    ('jquery-ui', 'https://code.jquery.com/ui/1.12.1/jquery-ui.min.js'),
+    ('jquery', 'https://code.jquery.com/jquery-3.7.1.min.js'),
+    ('jquery-ui', 'https://code.jquery.com/ui/1.13.2/jquery-ui.min.js'),
     ('moment', 'https://cdnjs.cloudflare.com/ajax/libs/'
-               'moment.js/2.29.1/moment.min.js'),
-    ('bootstrap', 'https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/'
+               'moment.js/2.30.1/moment.min.js'),
+    ('bootstrap', 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/'
                   'dist/js/bootstrap.bundle.min.js'),
-    ('fancybox', 'https://cdnjs.cloudflare.com/ajax/libs/'
-                 'fancybox/3.5.7/jquery.fancybox.min.js'),
+    ('fancybox', 'https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/'
+                 'dist/fancybox/fancybox.umd.js'),
     ('datepicker', 'https://cdnjs.cloudflare.com/ajax/libs/'
                    'bootstrap-datepicker/1.9.0/js/'
                    'bootstrap-datepicker.min.js'),
-    ('gwbootstrap', 'https://cdn.jsdelivr.net/npm/gwbootstrap@1.3.2/'
+    ('gwbootstrap', 'https://cdn.jsdelivr.net/npm/gwbootstrap@1.3.4/'
                     'lib/gwbootstrap-extra.min.js'),
 ))
 

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/html/tests/test_bootstrap.py

@@ -83,11 +83,11 @@ def test_state_switcher():
     assert parse_html(str(switcher)) == parse_html(
         '<ul class="nav navbar-nav">\n<li class="nav-item dropdown">\n'
         '<a class="nav-link dropdown-toggle" href="#" id="states" role='
-        '"button" title="Show/hide state menu" data-toggle="dropdown">Test</a>'
-        '\n<div class="dropdown-menu dropdown-menu-right state-switch shadow" '
-        'id="statemenu">\n<h6 class="dropdown-header">Select below to view '
-        'this page in another state (different time segments).</h6>\n<div '
-        'class="dropdown-divider"></div>\n<a class="dropdown-item state" '
+        '"button" title="Show/hide state menu" data-bs-toggle="dropdown">Test'
+        '</a>\n<div class="dropdown-menu dropdown-menu-end state-switch '
+        'shadow" id="statemenu">\n<h6 class="dropdown-header">Select below to '
+        'view this page in another state (different time segments).</h6>\n'
+        '<div class="dropdown-divider"></div>\n<a class="dropdown-item state" '
         'title="Test" id="state_test" onclick="jQuery(this).load_state'
         '(&quot;#test&quot;);">Test</a>\n</div>\n</li>\n</ul>')
 
@@ -102,6 +102,6 @@ def test_base_map_dropdown():
     assert parse_html(str(menu_wbases)) == parse_html(
         '<div class="dropdown base-map">\n<a href="#" class="navbar-brand '
         'nav-link border border-white rounded dropdown-toggle" role="button" '
-        'data-toggle="dropdown">test</a>\n<div class="dropdown-menu '
+        'data-bs-toggle="dropdown">test</a>\n<div class="dropdown-menu '
         'dropdown-1-col shadow">\n<a title="key" class="dropdown-item" '
         'data-new-base="value">key</a>\n</div>\n</div>')

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/html/tests/test_static.py

@@ -62,11 +62,11 @@ def test_get_js():
     # test list of files
     js_files = list(x.split('/')[-1] for x in js.values())
     assert js_files == [
-        'jquery-3.5.1.min.js',
+        'jquery-3.7.1.min.js',
         'jquery-ui.min.js',
         'moment.min.js',
         'bootstrap.bundle.min.js',
-        'jquery.fancybox.min.js',
+        'fancybox.umd.js',
         'bootstrap-datepicker.min.js',
         'gwbootstrap-extra.min.js',
     ]

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/plot/builtin.py

@@ -512,10 +512,11 @@ class SpectrumDataPlot(DataPlot):
                 data = get_coherence_spectrum(
                     [str(channel), str(channel2)], valid, query=False)
             elif self.type == 'range-spectrum':
-                data = get_range_spectrum(str(channel), valid, query=False)
+                data = get_range_spectrum(str(channel), valid, query=False,
+                                          state=valid)
             elif self.type == 'cumulative-range-spectrum':
-                data = get_range_spectrum(
-                    str(channel), valid, query=False, which='mean')
+                data = get_range_spectrum(str(channel), valid, query=False,
+                                          which='mean', state=valid)
                 if str(data.unit) == 'Mpc':
                     data = (data**3).cumsum() ** (1/3.)
                 else:
@@ -527,7 +528,8 @@ class SpectrumDataPlot(DataPlot):
             else:
                 try:
                     data = get_spectrum(str(channel), valid, query=False,
-                                        format=sdform, method=method)
+                                        format=sdform, method=method,
+                                        state=valid)
                 except ValueError as exc:
                     # math op failed beacuse one of the datasets is empty
                     if (

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/tabs/data.py

@@ -786,7 +786,7 @@ class DataTab(ProcessedTab, ParentTab):
                 page.div(class_='card border-info mb-1 shadow-sm')
                 page.div(class_='card-header text-white bg-info')
                 page.a(flag.name, class_='card-link cis-link collapsed',
-                       href='#flag%d' % i, **{'data-toggle': 'collapse',
+                       href='#flag%d' % i, **{'data-bs-toggle': 'collapse',
                                               'aria-expanded': 'false'})
                 page.div.close()  # card-header
                 page.div(id_='flag%d' % i, class_='collapse',

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm/tabs/guardian.py

@@ -293,7 +293,7 @@ class GuardianTab(DataTab):
             page.div(class_='card-header text-white bg-info')
             page.a('%s [%d]' % (name, bit), href='#collapse-%d' % bit,
                    class_='card-link cis-link collapsed',
-                   **{'data-toggle': 'collapse', 'aria-expandedt': 'false'})
+                   **{'data-bs-toggle': 'collapse', 'aria-expanded': 'false'})
             page.div.close()  # card-header
 
             # body

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gwsumm
-Version: 2.2.3
+Version: 2.2.4
 Summary: A python toolbox used by the LIGO Scientific Collaboration for detector characterisation
 Author-email: Alex Urban <alex.urban@ligo.org>, Duncan Macleod <duncan.macleod@ligo.org>
 Maintainer-email: Evan Goetz <evan.goetz@ligo.org>
@@ -28,7 +28,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: astropy>=3.0.0
 Requires-Dist: gwdatafind>=1.1.1
-Requires-Dist: gwdetchar>=2.0.0
+Requires-Dist: gwdetchar>=2.2.4
 Requires-Dist: gwpy>=2.0.0
 Requires-Dist: gwtrigfind
 Requires-Dist: lalsuite

{gwsumm-2.2.3 → gwsumm-2.2.4}/gwsumm.egg-info/requires.txt

@@ -1,6 +1,6 @@
 astropy>=3.0.0
 gwdatafind>=1.1.1
-gwdetchar>=2.0.0
+gwdetchar>=2.2.4
 gwpy>=2.0.0
 gwtrigfind
 lalsuite

{gwsumm-2.2.3 → gwsumm-2.2.4}/pyproject.toml

@@ -39,7 +39,7 @@ classifiers = [
 dependencies = [
   "astropy >=3.0.0",
   "gwdatafind >=1.1.1",
-  "gwdetchar >=2.0.0",
+  "gwdetchar >=2.2.4",
   "gwpy >=2.0.0",
   "gwtrigfind",
   "lalsuite",