Bug fixes, WIP

Author: bluemellophone

.github/workflows/testing.yaml

@@ -35,6 +35,10 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements/runtime.txt
           pip install -r requirements/optional.txt
+          cd tpl/pyastar2d
+          pip install -e .
+          cd ../../
+          pip install -e .
 
       - name: Check with pre-commit
         run: |

README.rst

@@ -200,16 +200,16 @@ Reference `pre-commit's installation instructions <https://pre-commit.com/#insta
 The code base has been formatted by `Black <https://black.readthedocs.io/en/stable/>`_.  Furthermore, try to conform to ``PEP8``.  You should set up your preferred editor to use ``flake8`` as its Python linter, but pre-commit will ensure compliance before a git commit is completed.  This will use the ``flake8`` configuration within ``setup.cfg``, which ignores several errors and stylistic considerations.  See the ``setup.cfg`` file for a full and accurate listing of stylistic codes to ignore.
 
 
-.. |Tests| image:: https://github.com/Kitware/batbot/actions/workflows/testing.yml/badge.svg?branch=main
-    :target: https://github.com/Kitware/batbot/actions/workflows/testing.yml
+.. |Tests| image:: https://github.com/Kitware/batbot/actions/workflows/testing.yaml/badge.svg?branch=main
+    :target: https://github.com/Kitware/batbot/actions/workflows/testing.yaml
     :alt: GitHub CI
 
 .. |Codecov| image:: https://codecov.io/gh/Kitware/batbot/branch/main/graph/badge.svg?token=FR6ITMWQNI
     :target: https://app.codecov.io/gh/Kitware/batbot
     :alt: Codecov
 
-.. |Wheel| image:: https://github.com/Kitware/batbot/actions/workflows/python-publish.yml/badge.svg
-    :target: https://github.com/Kitware/batbot/actions/workflows/python-publish.yml
+.. |Wheel| image:: https://github.com/Kitware/batbot/actions/workflows/python-publish.yaml/badge.svg
+    :target: https://github.com/Kitware/batbot/actions/workflows/python-publish.yaml
     :alt: Python Wheel
 
 .. |Docker| image:: https://img.shields.io/docker/image-size/kitware/batbot/latest

batbot/spectrogram/__init__.py

@@ -115,7 +115,7 @@ def plot_histogram(
     output_filename='histogram.png',
 ):
     if output_path is None:
-        return
+        return None, None, (None, None)
 
     if max_val is None:
         max_val = int(image.max())
@@ -1253,7 +1253,7 @@ def calculate_harmonic_and_echo_flags(
 
 @lp
 def compute_wrapper(
-    wav_filepath, annotations=None, output_folder='.', bitdepth=16, debug=True, **kwargs
+    wav_filepath, annotations=None, output_folder='.', bitdepth=16, debug=False, **kwargs
 ):
     """
     Compute the spectrograms for a given input WAV and saves them to disk.
@@ -1481,7 +1481,7 @@ def compute_wrapper(
 
     for key in segments:
         value = segments[key]
-        segments[key] = np.hstack(value) if len(value) > 0 else None.copy()
+        segments[key] = np.hstack(value) if len(value) > 0 else stft_db.copy()
 
     if debug_path:
         cv2.imwrite(join(debug_path, 'spectrogram.tif'), stft_db, [cv2.IMWRITE_TIFF_COMPRESSION, 1])

requirements/optional.txt

@@ -2,13 +2,13 @@ black
 codecov
 coverage
 flake8
-gradio
+# gradio
 imageio
 ipython
 isort
 line_profiler
-onnx
-onnxruntime
+# onnx
+# onnxruntime
 pre-commit
 pytest
 pytest-benchmark[histogram]
@@ -24,6 +24,6 @@ rstcheck
 rstcheck[sphinx]
 Sphinx>=5,<6
 sphinx_rtd_theme
-torch
-torchvision
+# torch
+# torchvision
 xdoctest

setup.cfg

@@ -19,23 +19,16 @@ platforms = any
 include_package_data = True
 install_requires =
     click
-    codecov
-    coverage
     cryptography
     cython
-    gradio
-    imgaug
     librosa
     matplotlib
     numpy
-    onnxruntime
     opencv-python-headless
     Pillow
     pooch
     rich
     sphinx-click
-    torch
-    torchvision
     tqdm
 python_requires = >=3.7
 

tests/test_batbot.py

@@ -1,13 +1,5 @@
 import batbot
 
 
-def test_fetch():
-    batbot.fetch(pull=False)
-    batbot.fetch(pull=True)
-
-    batbot.fetch(pull=False, config='usgs')
-    batbot.fetch(pull=True, config='usgs')
-
-
 def test_example():
     batbot.example()