dbdreader 0.6.0__tar.gz → 0.6.1__tar.gz

{dbdreader-0.6.0 → dbdreader-0.6.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: dbdreader
-Version: 0.6.0
+Version: 0.6.1
 Summary: A python module to access binary data files generated by Teledyne WebbResearch gliders
 Author-email: Lucas Merckelbach <lucas.merckelbach@hereon.de>
-License: GPL-3.0
+License: GPL-3.0-or-later
 Project-URL: Homepage, https://dbdreader.readthedocs.io/en/latest/
 Classifier: Programming Language :: Python :: 3
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -15,7 +15,6 @@ License-File: LICENSE
 License-File: COPYING
 Requires-Dist: lz4>=4.4.5
 Requires-Dist: numpy>=2.2.6
-Requires-Dist: scipy>=1.15.3
 Dynamic: license-file
 
 [![PyPI version](https://badgen.net/pypi/v/dbdreader)](https://pypi.org/project/dbdreader)
@@ -34,6 +33,10 @@ binary files, so that they can be further analysed.
 
 ## Change log
 
+### Version 6.0.1
+
+* Drops dependency on scipy.
+
 ### Version 6.0.0
 
 * Offers a python only implementation, alongside the C-extension to

{dbdreader-0.6.0 → dbdreader-0.6.1}/README.md

@@ -14,6 +14,10 @@ binary files, so that they can be further analysed.
 
 ## Change log
 
+### Version 6.0.1
+
+* Drops dependency on scipy.
+
 ### Version 6.0.0
 
 * Offers a python only implementation, alongside the C-extension to

{dbdreader-0.6.0 → dbdreader-0.6.1}/dbdreader/dbdreader.py

@@ -4,7 +4,6 @@ import os
 import struct
 import time
 import numpy
-from scipy.interpolate import interp1d as si_interp1d
 import glob
 import sys
 import re
@@ -308,6 +307,32 @@ def heading_interpolating_function_factory(t, v):
     return lambda _t: numpy.arctan2(yi(_t), xi(_t)) % (2*numpy.pi)
 
 
+def _default_interp1d_factory(x, y):
+    '''Default linear interpolating function factory used by get_sync()
+    and get_CTD_sync().
+
+    Equivalent to scipy.interpolate.interp1d(x, y, bounds_error=False,
+    fill_value=numpy.nan), implemented with numpy.interp instead so that
+    dbdreader does not require scipy as a runtime dependency. Callers that
+    want other interpolation schemes (e.g. cubic splines) can still pass
+    their own interpolating_function_factory, importing scipy themselves
+    if needed.
+
+    numpy.interp requires x to be sorted (non-decreasing); scipy's interp1d
+    sorts internally by default (assume_sorted=False), so we do the same
+    here rather than assume the caller's x is already ordered.
+    '''
+    if len(x) < 1:
+        raise ValueError("Interpolation requires at least one data point.")
+    x = numpy.asarray(x)
+    y = numpy.asarray(y)
+    if numpy.any(numpy.diff(x) < 0):
+        idx = numpy.argsort(x)
+        x = x[idx]
+        y = y[idx]
+    return partial(numpy.interp, xp=x, fp=y, left=numpy.nan, right=numpy.nan)
+
+
 class DBDCache(object):
 
     '''DBDCache manager
@@ -1631,7 +1656,7 @@ class MultiDBD(object):
         tv = self.get(*parameters, decimalLatLon=decimalLatLon, discardBadLatLon=discardBadLatLon,
                       return_nans=False)
         
-        default_interpolating_function_factory = partial(si_interp1d, bounds_error=False, fill_value=numpy.nan)
+        default_interpolating_function_factory = _default_interp1d_factory
         
         t = tv[0][0]
         r = []

{dbdreader-0.6.0 → dbdreader-0.6.1}/dbdreader.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: dbdreader
-Version: 0.6.0
+Version: 0.6.1
 Summary: A python module to access binary data files generated by Teledyne WebbResearch gliders
 Author-email: Lucas Merckelbach <lucas.merckelbach@hereon.de>
-License: GPL-3.0
+License: GPL-3.0-or-later
 Project-URL: Homepage, https://dbdreader.readthedocs.io/en/latest/
 Classifier: Programming Language :: Python :: 3
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -15,7 +15,6 @@ License-File: LICENSE
 License-File: COPYING
 Requires-Dist: lz4>=4.4.5
 Requires-Dist: numpy>=2.2.6
-Requires-Dist: scipy>=1.15.3
 Dynamic: license-file
 
 [![PyPI version](https://badgen.net/pypi/v/dbdreader)](https://pypi.org/project/dbdreader)
@@ -34,6 +33,10 @@ binary files, so that they can be further analysed.
 
 ## Change log
 
+### Version 6.0.1
+
+* Drops dependency on scipy.
+
 ### Version 6.0.0
 
 * Offers a python only implementation, alongside the C-extension to

{dbdreader-0.6.0 → dbdreader-0.6.1}/dbdreader.egg-info/requires.txt

@@ -1,3 +1,2 @@
 lz4>=4.4.5
 numpy>=2.2.6
-scipy>=1.15.3

{dbdreader-0.6.0 → dbdreader-0.6.1}/pyproject.toml

@@ -1,23 +1,22 @@
 [project]
 name = "dbdreader"
-version = "0.6.0"
+version = "0.6.1"
 description = "A python module to access binary data files generated by Teledyne WebbResearch gliders"
 readme = "README.md"
 requires-python = ">=3.10"
 authors = [
     {name = "Lucas Merckelbach", email = "lucas.merckelbach@hereon.de"}
 ]
-license = {text = "GPL-3.0"}
+license = {text = "GPL-3.0-or-later"}
 classifiers = [
     "Programming Language :: Python :: 3",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
     "Operating System :: POSIX",
 ]
 dependencies = [
     "lz4>=4.4.5",
     "numpy>=2.2.6",
-    "scipy>=1.15.3",
 ]
 
 

{dbdreader-0.6.0 → dbdreader-0.6.1}/requirements.txt

@@ -1,5 +1,4 @@
 numpy
-scipy
 pytest
 lz4