xarray-behave 0.35.8__tar.gz → 0.37.0__tar.gz

{xarray-behave-0.35.8 → xarray_behave-0.37.0}/PKG-INFO

@@ -1,36 +1,38 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: xarray-behave
-Version: 0.35.8
+Version: 0.37.0
 Summary: xarray tools for behavioral data.
 Author-email: Jan Clemens <clemensjan@googlemail.com>
-Requires-Python: >3.6
+Requires-Python: >3.9
 Description-Content-Type: text/markdown
-Classifier: License :: OSI Approved :: MIT License
-Requires-Dist: numpy
-Requires-Dist: scipy
-Requires-Dist: xarray
+Classifier: License :: OSI Approved :: Apache Software License
+Requires-Dist: defopt==6.3
+Requires-Dist: rich
+Requires-Dist: flammkuchen
 Requires-Dist: h5py
+Requires-Dist: pyyaml
 Requires-Dist: zarr
-Requires-Dist: flammkuchen
-Requires-Dist: rich
+Requires-Dist: numba
+Requires-Dist: xarray
+Requires-Dist: numpy
+Requires-Dist: scipy>1.9
 Requires-Dist: dask
-Requires-Dist: toolz
-Requires-Dist: pysoundfile
+Requires-Dist: pandas
+Requires-Dist: scikit-image
+Requires-Dist: scikit-learn
+Requires-Dist: peakutils
+Requires-Dist: librosa>0.8
+Requires-Dist: sounddevice
+Requires-Dist: soundfile
 Requires-Dist: opencv-python-headless
-Requires-Dist: pyside6 ; extra == "gui"
-Requires-Dist: pyqtgraph>0.12.2 ; extra == "gui"
-Requires-Dist: pyvideoreader ; extra == "gui"
-Requires-Dist: qtpy ; extra == "gui"
-Requires-Dist: superqt ; extra == "gui"
-Requires-Dist: sounddevice ; extra == "gui"
-Requires-Dist: scikit-image ; extra == "gui"
-Requires-Dist: pyyaml ; extra == "gui"
-Requires-Dist: defopt ; extra == "gui"
-Requires-Dist: colorcet ; extra == "gui"
-Requires-Dist: peakutils ; extra == "gui"
+Requires-Dist: pyvideoreader
+Requires-Dist: PySide6-Essentials
+Requires-Dist: pyqtgraph>0.12.2
+Requires-Dist: qtpy
+Requires-Dist: superqt
+Requires-Dist: colorcet
 Project-URL: documentation, https://janclemenslab.org/das/
 Project-URL: source, https://github.com/janclemenslab/xarray-behave
-Provides-Extra: gui
 
 # xarray-behave
 

{xarray-behave-0.35.8 → xarray_behave-0.37.0}/pyproject.toml

@@ -7,20 +7,20 @@ name = "xarray-behave"
 authors = [
        {name = "Jan Clemens", email = "clemensjan@googlemail.com"},
 ]
-classifiers = ["License :: OSI Approved :: MIT License"]
+classifiers = ["License :: OSI Approved :: Apache Software License"]
 dynamic = ["version", "description"]
-requires-python = ">3.6"
-dependencies = ['numpy', 'scipy', 'xarray', 'h5py', 'zarr', 'flammkuchen', 'rich',
-                'dask', 'toolz', 'pysoundfile', 'opencv-python-headless']
-readme = "README.md"
-
-[project.optional-dependencies]
-gui = ['pyside6', 'pyqtgraph>0.12.2', 'pyvideoreader', 'qtpy', 'superqt',
-       'sounddevice', 'scikit-image', 'pyyaml', 'defopt', 'colorcet',
-       'peakutils']
+requires-python = ">3.9"
+dependencies = ['defopt==6.3', 'rich', 'flammkuchen', 'h5py', 'pyyaml',
+                'zarr','numba', 'xarray', 'numpy', 'scipy>1.9',
+                'dask', 'pandas', 'scikit-image', 'scikit-learn',
+                'peakutils', 'librosa>0.8',
+                'sounddevice', 'soundfile',
+                'opencv-python-headless', 'pyvideoreader',
+                'PySide6-Essentials', 'pyqtgraph>0.12.2', 'qtpy', 'superqt',
+                'colorcet',
+                ]
 
-[project.scripts]
-xb = "xarray_behave.gui.app:cli"
+readme = "README.md"
 
 [project.urls]
 source = "https://github.com/janclemenslab/xarray-behave"

{xarray-behave-0.35.8 → xarray_behave-0.37.0}/src/xarray_behave/__init__.py

@@ -1,8 +1,8 @@
 """xarray tools for behavioral data."""
 
-__version__ = "0.35.8"
+__version__ = "0.37.0"
 
 from .xarray_behave import assemble, assemble_metrics, load, save
 import os
 
-os.environ["QT_API"] = "pyside2"
+os.environ["QT_API"] = "pyside6"

{xarray-behave-0.35.8 → xarray_behave-0.37.0}/src/xarray_behave/gui/das.py

@@ -1,4 +1,7 @@
 import logging
+
+logger = logging.getLogger(__name__)
+
 import collections
 from glob import glob
 import os.path
@@ -11,22 +14,22 @@ import librosa
 import scipy
 import h5py
 
+from .. import annot, event_utils
+
 import das.make_dataset as dsm
 import das.npy_dir
 import das.annot
 
-from .. import annot, event_utils
-
 import das.make_dataset
 import das.npy_dir
 import das.train
 import das.predict
 import das.block_stratify
 
+
 import xarray_behave
 
 package_dir = xarray_behave.__path__[0]
-logger = logging.getLogger(__name__)
 
 
 def data_loader_wav(filename: str, fs: Optional[float] = None, duration: Optional[float] = None):

{xarray-behave-0.35.8 → xarray_behave-0.37.0}/src/xarray_behave/gui/formbuilder.py

@@ -32,7 +32,7 @@ import yaml
 from typing import Any, Dict, List, Optional, Union, Text
 
 try:
-    import PySide2  # this will force pyqtgraph to use PySide instead of PyQt4/5
+    import PySide6  # this will force pyqtgraph to use PySide instead of PyQt4/5
 except ImportError:
     pass
 from qtpy import QtWidgets, QtCore, QtGui

{xarray-behave-0.35.8 → xarray_behave-0.37.0}/src/xarray_behave/gui/views.py

@@ -1,5 +1,5 @@
 try:
-    import PySide2  # this will force pyqtgraph to use PySide instead of PyQt4/5
+    import PySide6  # this will force pyqtgraph to use PySide instead of PyQt4/5
 except ImportError:
     pass
 

xarray_behave-0.37.0/tests/test_imports.py

@@ -0,0 +1,12 @@
+import pytest
+
+
+def test_imports():
+    import xarray_behave as xb
+    import xarray_behave.event_utils
+    import xarray_behave.metrics
+    import xarray_behave.loaders
+    import xarray_behave.annot
+
+    from xarray_behave.io import annotations, annotations_manual, audio, balltracks, movieparams, poses, tracks
+    from xarray_behave.gui import app, formbuilder, table, utils, views

xarray_behave-0.37.0/tests/test_sampstamps.py

@@ -0,0 +1,34 @@
+def test_monotonize():
+    import numpy as np
+    from xarray_behave.io.samplestamps.utils import monotonize, interpolator, ismonotonous
+
+    inc_strict = np.array([0, 1, 2, 3])
+    inc_nonstrict = np.array([0, 1, 2, 2])
+    dec_strict = inc_strict[::-1]
+    dec_nonstrict = inc_nonstrict[::-1]
+    assert ismonotonous(inc_strict, direction="increasing", strict=True) == True
+    assert ismonotonous(inc_strict, direction="increasing", strict=False) == True
+    assert ismonotonous(inc_nonstrict, direction="increasing", strict=True) == False
+    assert ismonotonous(inc_nonstrict, direction="decreasing", strict=False) == False
+    assert ismonotonous(dec_strict, direction="decreasing", strict=True) == True
+    assert ismonotonous(dec_nonstrict, direction="decreasing", strict=True) == False
+    assert ismonotonous(np.array([1]), direction="increasing", strict=True) == True
+    assert ismonotonous(np.array([1]), direction="increasing", strict=False) == True
+
+    x = np.array([0, 1, 2, 2, 1])
+    print(f"montonize {x}")
+    print(f"  strict, inc: {monotonize(x)}")
+    assert np.all(monotonize(x) == [0, 1, 2])
+    print(f"  strict, dec: {monotonize(x, direction='decreasing')}")
+    assert np.all(monotonize(x, direction="decreasing") == [0])
+    print(f"  nonstrict, in: {monotonize(x, strict=False)}")
+    assert np.all(monotonize(x, strict=False) == [0, 1, 2, 2])
+
+    x = np.array([2, 1, 0, 0, 1])
+    print(f"montonize {x}")
+    print(f"  strict, inc: {monotonize(x)}")
+    assert np.all(monotonize(x) == [2])
+    print(f"  strict, dec: {monotonize(x, direction='decreasing')}")
+    assert np.all(monotonize(x, direction="decreasing") == [2, 1, 0])
+    print(f"  nonstrict, dec: {monotonize(x, strict=False, direction='decreasing')}")
+    assert np.all(monotonize(x, strict=False, direction="decreasing") == [2, 1, 0, 0])

xarray-behave-0.35.8/tests/test_imports.py

@@ -1,14 +0,0 @@
-import pytest
-
-
-def test_imports():
-    import xarray_behave as xb
-    import xarray_behave.event_utils
-    import xarray_behave.metrics
-    import xarray_behave.loaders
-    import xarray_behave.annot
-
-    from xarray_behave.io import (annotations, annotations_manual, audio,
-                                  balltracks, movieparams, poses, tracks)
-    from xarray_behave.gui import (app, das, formbuilder, table,
-                                   utils, views)