gwsumm 2.3.0__tar.gz → 2.3.2__tar.gz

{gwsumm-2.3.0/gwsumm.egg-info → gwsumm-2.3.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: gwsumm
-Version: 2.3.0
+Version: 2.3.2
 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>
-License: GPL-3.0-or-later
+License-Expression: GPL-3.0-or-later
 Project-URL: Documentation, https://gwsumm.readthedocs.io
 Project-URL: Source Code, https://github.com/gwpy/gwsumm
 Project-URL: Bug Tracker, https://github.com/gwpy/gwsumm/issues
@@ -12,7 +12,6 @@ Project-URL: Discussion Forum, https://gwdetchar.slack.com
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python

{gwsumm-2.3.0 → gwsumm-2.3.2}/gwsumm/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.0'
-__version_tuple__ = version_tuple = (2, 3, 0)
+__version__ = version = '2.3.2'
+__version_tuple__ = version_tuple = (2, 3, 2)

{gwsumm-2.3.0 → gwsumm-2.3.2}/gwsumm/archive.py

@@ -34,7 +34,7 @@ import re
 import datetime
 import os
 
-from numpy import (unicode_, ndarray)
+from numpy import (issubdtype, ndarray)
 from h5py import File
 
 from astropy.table import Table
@@ -456,7 +456,7 @@ def archive_table(table, key, parent):
     except KeyError:
         pass
     for col in table.columns:
-        if table[col].dtype.type is unicode_:
+        if issubdtype(table[col].dtype, str):
             table.replace_column(col, table[col].astype(str))
     table.write(parent, path=key, format='hdf5')
     return key

{gwsumm-2.3.0 → gwsumm-2.3.2}/gwsumm/plot/noisebudget.py

@@ -133,10 +133,9 @@ class NoiseBudgetPlot(get_plot('spectrum')):
             d.override_unit(darmdata.unit)  # enforce consistent units
             sum_ += d ** 2
         ax.plot(sum_ ** (1/2.), zorder=1, **sumargs)
-        ax.lines.insert(1, ax.lines.pop(-1))
 
         # plot residual of noises
-        if not self.pargs.pop('no-residual', False):
+        if not self.pargs.get('no-residual', False):
             resargs = self.parse_residual_params()
             try:
                 residual = (darmdata ** 2 - sum_) ** (1/2.)
@@ -146,11 +145,18 @@ class NoiseBudgetPlot(get_plot('spectrum')):
                 else:  # other error
                     raise
             ax.plot(residual, zorder=-1000, **resargs)
-            ax.lines.insert(1, ax.lines.pop(-1))
+
+        # Reorder legend
+        lines = ax.get_lines()
+        if not self.pargs.pop('no-residual', False):
+            lines.insert(1, lines.pop(-1))
+            lines.insert(2, lines.pop(-1))
+        else:
+            lines.insert(1, lines.pop(-1))
 
         # finalize
         self.apply_parameters(ax, **self.pargs)
-        ax.legend(**legendargs)
+        ax.legend(handles=lines, **legendargs)
 
         return self.finalize()
 

{gwsumm-2.3.0 → gwsumm-2.3.2}/gwsumm/plot/sei.py

@@ -149,10 +149,8 @@ class SeiWatchDogPlot(get_plot('data')):
             ax.set_ylabel('')
             ax.set_title(texify(channel.name), fontsize=10)
             ax.xaxis.set_minor_locator(NullLocator())
-            for tick in ax.yaxis.get_major_ticks():
-                tick.label.set_fontsize(10)
-            for tick in ax.xaxis.get_major_ticks():
-                tick.label.set_fontsize(16)
+            ax.tick_params(axis='x', which='major', labelsize=16)
+            ax.tick_params(axis='y', which='major', labelsize=10)
         plot.text(0.5, 0.02, 'Time [seconds] from trip (%s)' % self.gpstime,
                   ha='center', va='bottom', fontsize=24)
         plot.text(0.01, 0.5, 'Amplitude %s' % self.unit, ha='left',

{gwsumm-2.3.0 → gwsumm-2.3.2}/gwsumm/tabs/sei.py

@@ -188,7 +188,7 @@ class SEIWatchDogTab(base):
                     causes = ['%s Unknown' % stage]
                 else:
                     allbits = numpy.nonzero(
-                        map(int, bin(int(bits))[2:][::-1]),
+                        numpy.atleast_1d(map(int, bin(int(bits))[2:][::-1])),
                     )[0]
                     causes = [latch.bits[b] for b in allbits]
                 t2 = Time(t, format='gps', scale='utc')

{gwsumm-2.3.0 → gwsumm-2.3.2/gwsumm.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: gwsumm
-Version: 2.3.0
+Version: 2.3.2
 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>
-License: GPL-3.0-or-later
+License-Expression: GPL-3.0-or-later
 Project-URL: Documentation, https://gwsumm.readthedocs.io
 Project-URL: Source Code, https://github.com/gwpy/gwsumm
 Project-URL: Bug Tracker, https://github.com/gwpy/gwsumm/issues
@@ -12,7 +12,6 @@ Project-URL: Discussion Forum, https://gwdetchar.slack.com
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python

{gwsumm-2.3.0 → gwsumm-2.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-  "setuptools>=61",
+  "setuptools>=77.0.3",
   "setuptools_scm[toml]>=3.4.3",
   "wheel",
 ]
@@ -18,12 +18,12 @@ authors = [
 maintainers = [
   { name = "Evan Goetz", email = "evan.goetz@ligo.org" },
 ]
-license = { text = "GPL-3.0-or-later" }
+license = "GPL-3.0-or-later"
+license-files = [ "LICENSE" ]
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Developers",
   "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
   "Natural Language :: English",
   "Operating System :: OS Independent",
   "Programming Language :: Python",
@@ -89,7 +89,6 @@ gwsumm-plot-triggers = "gwsumm.plot.triggers.__main__:main"
 "Discussion Forum" = "https://gwdetchar.slack.com"
 
 [tool.setuptools]
-license-files = [ "LICENSE" ]
 include-package-data = true
 
 [tool.setuptools.packages.find]