Bump versio and black formatting (#152)

soundata/annotations.py

@@ -1,5 +1,6 @@
 """soundata annotation data types
 """
+
 import numpy as np
 
 #: Time units

soundata/core.py

@@ -1,5 +1,6 @@
 """Core soundata classes
 """
+
 import json
 import os
 import random

soundata/datasets/dcase_bioacoustic.py

@@ -500,11 +500,16 @@ def _metadata(self):
                 "subdataset": os.path.normpath(v["csv"][0])
                 .split(clip_id)[0]
                 .split(os.path.sep)[-2],
-                "split": "train"
-                if "Training" in os.path.normpath(v["csv"][0]).split(clip_id)[0]
-                else "validation"
-                if "Validation" in os.path.normpath(v["csv"][0]).split(clip_id)[0]
-                else "evaluation",
+                "split": (
+                    "train"
+                    if "Training" in os.path.normpath(v["csv"][0]).split(clip_id)[0]
+                    else (
+                        "validation"
+                        if "Validation"
+                        in os.path.normpath(v["csv"][0]).split(clip_id)[0]
+                        else "evaluation"
+                    )
+                ),
             }
             for clip_id, v in self._index["clips"].items()
         }

soundata/datasets/freefield1010.py

@@ -35,7 +35,6 @@
 
 """
 
-
 import os
 from typing import BinaryIO, Optional, TextIO, Tuple
 

soundata/datasets/fsd50k.py

@@ -439,32 +439,40 @@ def load_ground_truth(data_path):
             if len(line) == 3:
                 if "collection" not in data_path:
                     ground_truth_dict[line[0]] = {
-                        "tags": list(line[1].split(","))
-                        if "," in line[1]
-                        else list([line[1]]),
-                        "mids": list(line[2].split(","))
-                        if "," in line[2]
-                        else list([line[2]]),
+                        "tags": (
+                            list(line[1].split(","))
+                            if "," in line[1]
+                            else list([line[1]])
+                        ),
+                        "mids": (
+                            list(line[2].split(","))
+                            if "," in line[2]
+                            else list([line[2]])
+                        ),
                         "split": "test",
                     }
                 else:
                     ground_truth_dict[line[0]] = {
-                        "tags": list(line[1].split(","))
-                        if "," in line[1]
-                        else list([line[1]]),
-                        "mids": list(line[2].split(","))
-                        if "," in line[2]
-                        else list([line[2]]),
+                        "tags": (
+                            list(line[1].split(","))
+                            if "," in line[1]
+                            else list([line[1]])
+                        ),
+                        "mids": (
+                            list(line[2].split(","))
+                            if "," in line[2]
+                            else list([line[2]])
+                        ),
                     }
                 clip_ids.append(line[0])
             if len(line) == 4:
                 ground_truth_dict[line[0]] = {
-                    "tags": list(line[1].split(","))
-                    if "," in line[1]
-                    else list([line[1]]),
-                    "mids": list(line[2].split(","))
-                    if "," in line[2]
-                    else list([line[2]]),
+                    "tags": (
+                        list(line[1].split(",")) if "," in line[1] else list([line[1]])
+                    ),
+                    "mids": (
+                        list(line[2].split(",")) if "," in line[2] else list([line[2]])
+                    ),
                     "split": "train" if line[3] == "train" else "validation",
                 }
                 clip_ids.append(line[0])

soundata/datasets/singapura.py

@@ -105,6 +105,7 @@
         Creative Commons Attribution-ShareAlike 4.0 International.
 
 """
+
 import os
 from typing import Dict, List, Optional, TextIO, Union
 

soundata/datasets/starss2022.py

@@ -305,10 +305,13 @@ def _process_raw_events(raw_reader, dt):
         # keep only one value if the event is static
         azimuths_elevations = [
             [
-                np.array([azimuth[0], elevation[0]])
-                if (azimuth == azimuth[0]).all() and (elevation == elevation[0]).all()
-                else np.concatenate(
-                    [azimuth[:, np.newaxis], elevation[:, np.newaxis]], axis=1
+                (
+                    np.array([azimuth[0], elevation[0]])
+                    if (azimuth == azimuth[0]).all()
+                    and (elevation == elevation[0]).all()
+                    else np.concatenate(
+                        [azimuth[:, np.newaxis], elevation[:, np.newaxis]], axis=1
+                    )
                 )
                 for azimuth, elevation in zip(event_azimuths, event_elevations)
             ]
@@ -318,18 +321,22 @@ def _process_raw_events(raw_reader, dt):
         # separate azimuths and elevations again
         azimuths = [
             [
-                azimuth_elevation[:, 0]
-                if len(azimuth_elevation.shape) == 2
-                else np.array([azimuth_elevation[0]])
+                (
+                    azimuth_elevation[:, 0]
+                    if len(azimuth_elevation.shape) == 2
+                    else np.array([azimuth_elevation[0]])
+                )
                 for azimuth_elevation in event_azimuths_elevations
             ]
             for event_azimuths_elevations in azimuths_elevations
         ]
         elevations = [
             [
-                azimuth_elevation[:, 1]
-                if len(azimuth_elevation.shape) == 2
-                else np.array([azimuth_elevation[1]])
+                (
+                    azimuth_elevation[:, 1]
+                    if len(azimuth_elevation.shape) == 2
+                    else np.array([azimuth_elevation[1]])
+                )
                 for azimuth_elevation in event_azimuths_elevations
             ]
             for event_azimuths_elevations in azimuths_elevations

soundata/datasets/tau2020sse_nigens.py

@@ -296,10 +296,13 @@ def _process_raw_events(raw_reader, dt):
         # keep only one value if the event is static
         azimuths_elevations = [
             [
-                np.array([azimuth[0], elevation[0]])
-                if (azimuth == azimuth[0]).all() and (elevation == elevation[0]).all()
-                else np.concatenate(
-                    [azimuth[:, np.newaxis], elevation[:, np.newaxis]], axis=1
+                (
+                    np.array([azimuth[0], elevation[0]])
+                    if (azimuth == azimuth[0]).all()
+                    and (elevation == elevation[0]).all()
+                    else np.concatenate(
+                        [azimuth[:, np.newaxis], elevation[:, np.newaxis]], axis=1
+                    )
                 )
                 for azimuth, elevation in zip(event_azimuths, event_elevations)
             ]
@@ -309,18 +312,22 @@ def _process_raw_events(raw_reader, dt):
         # separate azimuths and elevations again
         azimuths = [
             [
-                azimuth_elevation[:, 0]
-                if len(azimuth_elevation.shape) == 2
-                else np.array([azimuth_elevation[0]])
+                (
+                    azimuth_elevation[:, 0]
+                    if len(azimuth_elevation.shape) == 2
+                    else np.array([azimuth_elevation[0]])
+                )
                 for azimuth_elevation in event_azimuths_elevations
             ]
             for event_azimuths_elevations in azimuths_elevations
         ]
         elevations = [
             [
-                azimuth_elevation[:, 1]
-                if len(azimuth_elevation.shape) == 2
-                else np.array([azimuth_elevation[1]])
+                (
+                    azimuth_elevation[:, 1]
+                    if len(azimuth_elevation.shape) == 2
+                    else np.array([azimuth_elevation[1]])
+                )
                 for azimuth_elevation in event_azimuths_elevations
             ]
             for event_azimuths_elevations in azimuths_elevations

soundata/datasets/tau2021sse_nigens.py

@@ -305,10 +305,13 @@ def _process_raw_events(raw_reader, dt):
         # keep only one value if the event is static
         azimuths_elevations = [
             [
-                np.array([azimuth[0], elevation[0]])
-                if (azimuth == azimuth[0]).all() and (elevation == elevation[0]).all()
-                else np.concatenate(
-                    [azimuth[:, np.newaxis], elevation[:, np.newaxis]], axis=1
+                (
+                    np.array([azimuth[0], elevation[0]])
+                    if (azimuth == azimuth[0]).all()
+                    and (elevation == elevation[0]).all()
+                    else np.concatenate(
+                        [azimuth[:, np.newaxis], elevation[:, np.newaxis]], axis=1
+                    )
                 )
                 for azimuth, elevation in zip(event_azimuths, event_elevations)
             ]
@@ -318,18 +321,22 @@ def _process_raw_events(raw_reader, dt):
         # separate azimuths and elevations again
         azimuths = [
             [
-                azimuth_elevation[:, 0]
-                if len(azimuth_elevation.shape) == 2
-                else np.array([azimuth_elevation[0]])
+                (
+                    azimuth_elevation[:, 0]
+                    if len(azimuth_elevation.shape) == 2
+                    else np.array([azimuth_elevation[0]])
+                )
                 for azimuth_elevation in event_azimuths_elevations
             ]
             for event_azimuths_elevations in azimuths_elevations
         ]
         elevations = [
             [
-                azimuth_elevation[:, 1]
-                if len(azimuth_elevation.shape) == 2
-                else np.array([azimuth_elevation[1]])
+                (
+                    azimuth_elevation[:, 1]
+                    if len(azimuth_elevation.shape) == 2
+                    else np.array([azimuth_elevation[1]])
+                )
                 for azimuth_elevation in event_azimuths_elevations
             ]
             for event_azimuths_elevations in azimuths_elevations

soundata/jams_utils.py

@@ -1,5 +1,6 @@
 """Utilities for converting soundata Annotation classes to jams format.
 """
+
 import logging
 import os
 from typing import Callable, List

soundata/version.py

@@ -2,4 +2,4 @@
 """Version info"""
 
 short_version = "0.1"
-version = "0.1.2"
+version = "0.1.3"

tests/test_full_dataset.py

@@ -2,6 +2,7 @@
 This test takes a long time, but it makes sure that the datset can be locally downloaded,
 validated successfully, and loaded.
 """
+
 import os
 import pytest
 import tqdm