diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 954d048ab..aeef41c20 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,13 +20,13 @@ repos: - id: check-toml - repo: https://github.com/asottile/pyupgrade - rev: v3.15.0 + rev: v3.15.2 hooks: - id: pyupgrade args: [--py38-plus] - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 24.3.0 hooks: - id: black types: [python] @@ -52,7 +52,7 @@ repos: args: ["--profile", "black"] - repo: https://github.com/nbQA-dev/nbQA - rev: 1.7.1 + rev: 1.8.5 hooks: - id: nbqa-black - id: nbqa-flake8 @@ -60,12 +60,12 @@ repos: - id: nbqa-isort - repo: https://github.com/kynan/nbstripout - rev: 0.6.1 + rev: 0.7.1 hooks: - id: nbstripout - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.8.0 + rev: v1.9.0 hooks: - id: mypy args: @@ -73,13 +73,13 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: "v0.1.13" + rev: "v0.3.5" hooks: - id: ruff # Serious pylint errors that will be enforced by CI - repo: https://github.com/pycqa/pylint - rev: v3.0.3 + rev: v3.1.0 hooks: - id: pylint args: diff --git a/clarity/__init__.py b/clarity/__init__.py index 9f9bb6c54..a703841d1 100644 --- a/clarity/__init__.py +++ b/clarity/__init__.py @@ -1,4 +1,5 @@ """pyClarity""" + from importlib.metadata import PackageNotFoundError, version try: diff --git a/clarity/data/HOA_tools_cec2.py b/clarity/data/HOA_tools_cec2.py index 4eb853f65..023dfbb69 100644 --- a/clarity/data/HOA_tools_cec2.py +++ b/clarity/data/HOA_tools_cec2.py @@ -1,4 +1,5 @@ """Tools to support higher order ambisonic processing.""" + from __future__ import annotations import logging diff --git a/clarity/data/demo_data.py b/clarity/data/demo_data.py index 3c9575826..b7f27ac35 100644 --- a/clarity/data/demo_data.py +++ b/clarity/data/demo_data.py @@ -1,4 +1,5 @@ """Functions for downloading demo data.""" + import os from pathlib import Path diff --git a/clarity/data/scene_builder_cec2.py b/clarity/data/scene_builder_cec2.py index 9978ecd94..52b18296c 100644 --- a/clarity/data/scene_builder_cec2.py +++ b/clarity/data/scene_builder_cec2.py @@ -1,4 +1,5 @@ """Code for building the scenes.json files.""" + from __future__ import annotations import itertools diff --git a/clarity/data/scene_renderer_cec1.py b/clarity/data/scene_renderer_cec1.py index a83aacbf0..2545078ff 100644 --- a/clarity/data/scene_renderer_cec1.py +++ b/clarity/data/scene_renderer_cec1.py @@ -1,4 +1,5 @@ """Scene rendering for CEC1 challenge.""" + import logging import math from pathlib import Path diff --git a/clarity/data/scene_renderer_cec2.py b/clarity/data/scene_renderer_cec2.py index e0afcd8f3..995239a30 100644 --- a/clarity/data/scene_renderer_cec2.py +++ b/clarity/data/scene_renderer_cec2.py @@ -1,4 +1,5 @@ """Clarity ambisonic scene rendering.""" + import json import logging import math diff --git a/clarity/data/utils.py b/clarity/data/utils.py index e02925fcf..7bbeae9a4 100644 --- a/clarity/data/utils.py +++ b/clarity/data/utils.py @@ -1,4 +1,5 @@ """Utilities for data generation.""" + from __future__ import annotations from pathlib import Path diff --git a/clarity/engine/system.py b/clarity/engine/system.py index c6fdf35a6..1cb0b3d95 100644 --- a/clarity/engine/system.py +++ b/clarity/engine/system.py @@ -2,6 +2,7 @@ Adopted from Asteroid https://github.com/asteroid-team/asteroid/blob/master/asteroid/engine/system.py """ + import pytorch_lightning as pl from torch.optim.lr_scheduler import ReduceLROnPlateau diff --git a/clarity/enhancer/compressor.py b/clarity/enhancer/compressor.py index b98157c4e..f9a5814bd 100644 --- a/clarity/enhancer/compressor.py +++ b/clarity/enhancer/compressor.py @@ -1,4 +1,5 @@ """Compressor Class""" + from __future__ import annotations from typing import Any, Final diff --git a/clarity/enhancer/dnn/mc_conv_tasnet.py b/clarity/enhancer/dnn/mc_conv_tasnet.py index d336e9fab..cc24f32ec 100644 --- a/clarity/enhancer/dnn/mc_conv_tasnet.py +++ b/clarity/enhancer/dnn/mc_conv_tasnet.py @@ -1,4 +1,5 @@ """Adopted from https://github.com/kaituoxu/Conv-TasNet""" + from __future__ import annotations import math diff --git a/clarity/evaluator/haaqi/haaqi.py b/clarity/evaluator/haaqi/haaqi.py index b3ba3b035..7afcb587a 100644 --- a/clarity/evaluator/haaqi/haaqi.py +++ b/clarity/evaluator/haaqi/haaqi.py @@ -1,4 +1,5 @@ """Matlab's haaqi version 1 to python version.""" + from __future__ import annotations import logging diff --git a/clarity/evaluator/haspi/__init__.py b/clarity/evaluator/haspi/__init__.py index 72bee6c90..26020a8eb 100644 --- a/clarity/evaluator/haspi/__init__.py +++ b/clarity/evaluator/haspi/__init__.py @@ -1,4 +1,5 @@ """HASPI intelligibility index.""" + from clarity.evaluator.haspi.haspi import haspi_v2, haspi_v2_be __all__ = ["haspi_v2", "haspi_v2_be"] diff --git a/clarity/evaluator/haspi/eb.py b/clarity/evaluator/haspi/eb.py index 415afe2cc..61758145d 100644 --- a/clarity/evaluator/haspi/eb.py +++ b/clarity/evaluator/haspi/eb.py @@ -1,4 +1,5 @@ """Module for HASPI, HASQI, HAAQI EBs""" + from __future__ import annotations # pylint: disable=import-error diff --git a/clarity/evaluator/haspi/ebm.py b/clarity/evaluator/haspi/ebm.py index 5c2e6f110..7825a7a91 100644 --- a/clarity/evaluator/haspi/ebm.py +++ b/clarity/evaluator/haspi/ebm.py @@ -1,4 +1,5 @@ """HASPI EBM module""" + from __future__ import annotations from math import floor diff --git a/clarity/evaluator/haspi/haspi.py b/clarity/evaluator/haspi/haspi.py index 7dae0899d..fef3e607b 100644 --- a/clarity/evaluator/haspi/haspi.py +++ b/clarity/evaluator/haspi/haspi.py @@ -1,4 +1,5 @@ """HASPI intelligibility Index""" + from __future__ import annotations import logging diff --git a/clarity/evaluator/haspi/ip.py b/clarity/evaluator/haspi/ip.py index 0fc251677..6dc6086ac 100644 --- a/clarity/evaluator/haspi/ip.py +++ b/clarity/evaluator/haspi/ip.py @@ -1,4 +1,5 @@ """Functions for HASPI neural network stage.""" + from __future__ import annotations import numpy as np diff --git a/clarity/evaluator/mbstoi/__init__.py b/clarity/evaluator/mbstoi/__init__.py index dc70efad1..f798b1e8e 100644 --- a/clarity/evaluator/mbstoi/__init__.py +++ b/clarity/evaluator/mbstoi/__init__.py @@ -1,4 +1,5 @@ """Modified Binaural Short-Time Objective Intelligibility Evaluator""" + from clarity.evaluator.mbstoi.mbstoi import mbstoi __all__ = ["mbstoi"] diff --git a/clarity/evaluator/mbstoi/mbstoi.py b/clarity/evaluator/mbstoi/mbstoi.py index dae7f5f8d..890cc9c3c 100644 --- a/clarity/evaluator/mbstoi/mbstoi.py +++ b/clarity/evaluator/mbstoi/mbstoi.py @@ -1,4 +1,5 @@ """Modified Binaural Short-Time Objective Intelligibility (MBSTOI) Measure""" + import importlib.resources as pkg_resources import logging import math diff --git a/clarity/evaluator/mbstoi/mbstoi_utils.py b/clarity/evaluator/mbstoi/mbstoi_utils.py index 12a32b87c..fcc811c1d 100644 --- a/clarity/evaluator/mbstoi/mbstoi_utils.py +++ b/clarity/evaluator/mbstoi/mbstoi_utils.py @@ -1,4 +1,5 @@ """Utilities for MBSTOI processing.""" + from __future__ import annotations import logging diff --git a/clarity/evaluator/msbg/cochlea.py b/clarity/evaluator/msbg/cochlea.py index 9567dd432..5d47bfbbc 100644 --- a/clarity/evaluator/msbg/cochlea.py +++ b/clarity/evaluator/msbg/cochlea.py @@ -1,4 +1,5 @@ """Gammatone filterbank simulation of the Cochlea.""" + from __future__ import annotations import logging diff --git a/clarity/evaluator/msbg/msbg.py b/clarity/evaluator/msbg/msbg.py index 25ca058b8..204144f09 100644 --- a/clarity/evaluator/msbg/msbg.py +++ b/clarity/evaluator/msbg/msbg.py @@ -1,4 +1,5 @@ """Implementation of the MSBG hearing loss model.""" + from __future__ import annotations import logging diff --git a/clarity/evaluator/msbg/msbg_utils.py b/clarity/evaluator/msbg/msbg_utils.py index 9b6e577c9..935d920a5 100644 --- a/clarity/evaluator/msbg/msbg_utils.py +++ b/clarity/evaluator/msbg/msbg_utils.py @@ -1,4 +1,5 @@ """Support for the MSBG hearing loss model.""" + from __future__ import annotations import json diff --git a/clarity/evaluator/msbg/smearing.py b/clarity/evaluator/msbg/smearing.py index a3f72b287..9b3bb9f46 100644 --- a/clarity/evaluator/msbg/smearing.py +++ b/clarity/evaluator/msbg/smearing.py @@ -1,4 +1,5 @@ """Temporal smearing component of MSBG model.""" + from __future__ import annotations import math diff --git a/clarity/predictor/torch_msbg.py b/clarity/predictor/torch_msbg.py index 7d64dae02..b6c1f088e 100644 --- a/clarity/predictor/torch_msbg.py +++ b/clarity/predictor/torch_msbg.py @@ -1,6 +1,7 @@ """ An FIR-based torch implementation of approximated MSBG hearing loss model """ + from __future__ import annotations import json diff --git a/clarity/predictor/torch_stoi.py b/clarity/predictor/torch_stoi.py index 7581f3dbd..76cc7aab3 100644 --- a/clarity/predictor/torch_stoi.py +++ b/clarity/predictor/torch_stoi.py @@ -3,6 +3,7 @@ and star the repo. The pip version of torch_stoi does not include EPS in line 127 & 128, hence could lead to sqrt(0) """ + from typing import Final import numpy as np diff --git a/clarity/utils/audiogram.py b/clarity/utils/audiogram.py index 712f40ca2..59e7bd41b 100644 --- a/clarity/utils/audiogram.py +++ b/clarity/utils/audiogram.py @@ -1,4 +1,5 @@ """Dataclass to represent a monaural audiogram""" + from __future__ import annotations import json diff --git a/clarity/utils/car_noise_simulator/carnoise_parameters_generator.py b/clarity/utils/car_noise_simulator/carnoise_parameters_generator.py index 3f37da736..431a8fa89 100644 --- a/clarity/utils/car_noise_simulator/carnoise_parameters_generator.py +++ b/clarity/utils/car_noise_simulator/carnoise_parameters_generator.py @@ -3,6 +3,7 @@ These are 2 separated class to keep the logic separated """ + from __future__ import annotations from typing import Final diff --git a/clarity/utils/car_noise_simulator/carnoise_signal_generator.py b/clarity/utils/car_noise_simulator/carnoise_signal_generator.py index 9de4ea38f..9886fde71 100644 --- a/clarity/utils/car_noise_simulator/carnoise_signal_generator.py +++ b/clarity/utils/car_noise_simulator/carnoise_signal_generator.py @@ -1,6 +1,7 @@ """ Class to generate the car noise signal. """ + from __future__ import annotations from typing import Final diff --git a/clarity/utils/file_io.py b/clarity/utils/file_io.py index 0c9f3393a..b9c5f3758 100644 --- a/clarity/utils/file_io.py +++ b/clarity/utils/file_io.py @@ -1,4 +1,5 @@ """File I/O functions.""" + from __future__ import annotations import json diff --git a/clarity/utils/flac_encoder.py b/clarity/utils/flac_encoder.py index 55718a98c..56eaef92e 100644 --- a/clarity/utils/flac_encoder.py +++ b/clarity/utils/flac_encoder.py @@ -2,6 +2,7 @@ Class for encoding and decoding audio signals using flac compression. """ + from __future__ import annotations import logging diff --git a/clarity/utils/results_support.py b/clarity/utils/results_support.py index e77ffe7fa..13a984a29 100644 --- a/clarity/utils/results_support.py +++ b/clarity/utils/results_support.py @@ -1,4 +1,5 @@ """Dataclass to save challenges results to a CSV file.""" + from __future__ import annotations # pylint: disable=import-error diff --git a/clarity/utils/signal_processing.py b/clarity/utils/signal_processing.py index 0589ce267..14e8e502d 100644 --- a/clarity/utils/signal_processing.py +++ b/clarity/utils/signal_processing.py @@ -1,4 +1,5 @@ """Signal processing utilities.""" + # pylint: disable=import-error from __future__ import annotations diff --git a/clarity/utils/source_separation_support.py b/clarity/utils/source_separation_support.py index 0b4279fd7..2f48b978c 100644 --- a/clarity/utils/source_separation_support.py +++ b/clarity/utils/source_separation_support.py @@ -1,4 +1,5 @@ """Module that contains functions for source separation.""" + from __future__ import annotations # pylint: disable=import-error diff --git a/docs/conf.py b/docs/conf.py index e70c36fd7..34def907a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,5 @@ """Sphinx configuration""" + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. diff --git a/recipes/cad1/task1/baseline/enhance.py b/recipes/cad1/task1/baseline/enhance.py index 610ebd67d..a0abbaa5f 100644 --- a/recipes/cad1/task1/baseline/enhance.py +++ b/recipes/cad1/task1/baseline/enhance.py @@ -1,4 +1,5 @@ """ Run the dummy enhancement. """ + from __future__ import annotations # pylint: disable=too-many-locals diff --git a/recipes/cad1/task1/baseline/evaluate.py b/recipes/cad1/task1/baseline/evaluate.py index 1543a9b96..9994ff1d2 100644 --- a/recipes/cad1/task1/baseline/evaluate.py +++ b/recipes/cad1/task1/baseline/evaluate.py @@ -1,4 +1,5 @@ """Evaluate the enhanced signals using the HAAQI metric.""" + from __future__ import annotations # pylint: disable=too-many-locals diff --git a/recipes/cad1/task1/baseline/test.py b/recipes/cad1/task1/baseline/test.py index 47592ad17..927ac5972 100644 --- a/recipes/cad1/task1/baseline/test.py +++ b/recipes/cad1/task1/baseline/test.py @@ -1,4 +1,5 @@ """ Run the baseline enhancement. """ + from __future__ import annotations # pylint: disable=import-error diff --git a/recipes/cad1/task2/baseline/audio_manager.py b/recipes/cad1/task2/baseline/audio_manager.py index c1fc4432f..82f750e41 100644 --- a/recipes/cad1/task2/baseline/audio_manager.py +++ b/recipes/cad1/task2/baseline/audio_manager.py @@ -1,4 +1,5 @@ """A utility class for managing audio files.""" + from __future__ import annotations import logging diff --git a/recipes/cad1/task2/baseline/baseline_utils.py b/recipes/cad1/task2/baseline/baseline_utils.py index 5a458fc31..b8308ac8e 100644 --- a/recipes/cad1/task2/baseline/baseline_utils.py +++ b/recipes/cad1/task2/baseline/baseline_utils.py @@ -1,4 +1,5 @@ """Utility functions for the baseline model.""" + from __future__ import annotations # pylint: disable=import-error diff --git a/recipes/cad1/task2/baseline/car_scene_acoustics.py b/recipes/cad1/task2/baseline/car_scene_acoustics.py index 8bf5510ac..ad13a5aff 100644 --- a/recipes/cad1/task2/baseline/car_scene_acoustics.py +++ b/recipes/cad1/task2/baseline/car_scene_acoustics.py @@ -1,4 +1,5 @@ """A class for the car acoustic environment.""" + # pylint: disable=import-error # pylint: disable=too-many-instance-attributes from __future__ import annotations diff --git a/recipes/cad1/task2/baseline/enhance.py b/recipes/cad1/task2/baseline/enhance.py index 6c85a6b88..263d472f3 100644 --- a/recipes/cad1/task2/baseline/enhance.py +++ b/recipes/cad1/task2/baseline/enhance.py @@ -1,4 +1,5 @@ """ Run the dummy enhancement. """ + # pylint: disable=too-many-locals # pylint: disable=import-error from __future__ import annotations diff --git a/recipes/cad1/task2/baseline/evaluate.py b/recipes/cad1/task2/baseline/evaluate.py index b3a202b6c..37af6f484 100644 --- a/recipes/cad1/task2/baseline/evaluate.py +++ b/recipes/cad1/task2/baseline/evaluate.py @@ -1,4 +1,5 @@ """Evaluate the enhanced signals using the HAAQI metric.""" + # pylint: disable=too-many-locals # pylint: disable=import-error from __future__ import annotations diff --git a/recipes/cad1/task2/baseline/test.py b/recipes/cad1/task2/baseline/test.py index 8e5e26638..d7be33ebe 100644 --- a/recipes/cad1/task2/baseline/test.py +++ b/recipes/cad1/task2/baseline/test.py @@ -1,4 +1,5 @@ """ Run the dummy enhancement. """ + # pylint: disable=too-many-locals # pylint: disable=import-error from __future__ import annotations diff --git a/recipes/cad1/task2/data_preparation/build_scene_metadata.py b/recipes/cad1/task2/data_preparation/build_scene_metadata.py index 9cab5811e..a3ec173fd 100644 --- a/recipes/cad1/task2/data_preparation/build_scene_metadata.py +++ b/recipes/cad1/task2/data_preparation/build_scene_metadata.py @@ -1,4 +1,5 @@ """Module to Generate the metadata for the scenes in the CAD-1 Task-2 challenge.""" + # pylint: disable=import-error from __future__ import annotations diff --git a/recipes/cad_icassp_2024/baseline/enhance.py b/recipes/cad_icassp_2024/baseline/enhance.py index 569389afc..d6fec3144 100644 --- a/recipes/cad_icassp_2024/baseline/enhance.py +++ b/recipes/cad_icassp_2024/baseline/enhance.py @@ -1,4 +1,5 @@ """ Run the dummy enhancement. """ + from __future__ import annotations import json diff --git a/recipes/cad_icassp_2024/baseline/evaluate.py b/recipes/cad_icassp_2024/baseline/evaluate.py index 75b4e5787..a40e047e7 100644 --- a/recipes/cad_icassp_2024/baseline/evaluate.py +++ b/recipes/cad_icassp_2024/baseline/evaluate.py @@ -1,4 +1,5 @@ """Evaluate the enhanced signals using the HAAQI metric.""" + from __future__ import annotations # pylint: disable=import-error diff --git a/recipes/cad_icassp_2024/generate_dataset/generate_at_mic_musdb18.py b/recipes/cad_icassp_2024/generate_dataset/generate_at_mic_musdb18.py index e98ced488..7d3a84a49 100644 --- a/recipes/cad_icassp_2024/generate_dataset/generate_at_mic_musdb18.py +++ b/recipes/cad_icassp_2024/generate_dataset/generate_at_mic_musdb18.py @@ -16,6 +16,7 @@ - The metadata of the music at the hearing aids microphone. - The music signals at the hearing aids microphone. """ + from __future__ import annotations # pylint: disable=import-error diff --git a/recipes/cad_icassp_2024/generate_dataset/generate_train_scenes.py b/recipes/cad_icassp_2024/generate_dataset/generate_train_scenes.py index 2667e287c..7f85aa590 100644 --- a/recipes/cad_icassp_2024/generate_dataset/generate_train_scenes.py +++ b/recipes/cad_icassp_2024/generate_dataset/generate_train_scenes.py @@ -1,4 +1,5 @@ """Module to generate the scenes and scene-listeners metadata files for training""" + from __future__ import annotations # pylint: disable=import-error diff --git a/recipes/cpc1/e029_sheffield/prepare_data.py b/recipes/cpc1/e029_sheffield/prepare_data.py index b14bf109d..cff25f58a 100644 --- a/recipes/cpc1/e029_sheffield/prepare_data.py +++ b/recipes/cpc1/e029_sheffield/prepare_data.py @@ -1,4 +1,5 @@ """Data preparation for the E029 Sheffield CPC1 recipe.""" + import csv import json import logging diff --git a/recipes/cpc1/e029_sheffield/transformer_cpc1_ensemble_decoder.py b/recipes/cpc1/e029_sheffield/transformer_cpc1_ensemble_decoder.py index 001235453..80bb1ad7a 100644 --- a/recipes/cpc1/e029_sheffield/transformer_cpc1_ensemble_decoder.py +++ b/recipes/cpc1/e029_sheffield/transformer_cpc1_ensemble_decoder.py @@ -8,6 +8,7 @@ Modified by Zehai Tu for uncertainty estimation with ensemble """ + import speechbrain as sb import torch from speechbrain.decoders.ctc import CTCPrefixScorer diff --git a/recipes/cpc1/e032_sheffield/prepare_data.py b/recipes/cpc1/e032_sheffield/prepare_data.py index c2bdbb95c..5ae96eeef 100644 --- a/recipes/cpc1/e032_sheffield/prepare_data.py +++ b/recipes/cpc1/e032_sheffield/prepare_data.py @@ -1,4 +1,5 @@ """Data preparation for the E032 Sheffield CPC1 recipe.""" + import csv import json import logging diff --git a/recipes/cpc1/e032_sheffield/transformer_cpc1_decoder.py b/recipes/cpc1/e032_sheffield/transformer_cpc1_decoder.py index 1cd80dbae..2b06bc8e4 100644 --- a/recipes/cpc1/e032_sheffield/transformer_cpc1_decoder.py +++ b/recipes/cpc1/e032_sheffield/transformer_cpc1_decoder.py @@ -6,6 +6,7 @@ * Mirco Ravanelli 2020 * Sung-Lin Yeh 2020 """ + import speechbrain as sb import torch from speechbrain.decoders.ctc import CTCPrefixScorer diff --git a/recipes/cpc2/baseline/compute_haspi.py b/recipes/cpc2/baseline/compute_haspi.py index 6150996b0..7f4a312a9 100644 --- a/recipes/cpc2/baseline/compute_haspi.py +++ b/recipes/cpc2/baseline/compute_haspi.py @@ -1,4 +1,5 @@ """ Compute the HASPI scores. """ + from __future__ import annotations import hashlib diff --git a/recipes/cpc2/baseline/evaluate.py b/recipes/cpc2/baseline/evaluate.py index f69e2498f..83b727ef4 100644 --- a/recipes/cpc2/baseline/evaluate.py +++ b/recipes/cpc2/baseline/evaluate.py @@ -1,4 +1,5 @@ """Evaluate the predictions against the ground truth correctness values""" + import json import logging from pathlib import Path diff --git a/recipes/cpc2/baseline/predict.py b/recipes/cpc2/baseline/predict.py index 6b3ee9b49..f94a66707 100644 --- a/recipes/cpc2/baseline/predict.py +++ b/recipes/cpc2/baseline/predict.py @@ -1,4 +1,5 @@ """Make intelligibility predictions from HASPI scores.""" + from __future__ import annotations import json diff --git a/recipes/icassp_2023/baseline/enhance.py b/recipes/icassp_2023/baseline/enhance.py index 7576e1147..40a353f29 100644 --- a/recipes/icassp_2023/baseline/enhance.py +++ b/recipes/icassp_2023/baseline/enhance.py @@ -1,4 +1,5 @@ """ Run the dummy enhancement. """ + import json import logging import pathlib diff --git a/recipes/icassp_2023/baseline/evaluate.py b/recipes/icassp_2023/baseline/evaluate.py index 2b84c05e9..5c42c3715 100644 --- a/recipes/icassp_2023/baseline/evaluate.py +++ b/recipes/icassp_2023/baseline/evaluate.py @@ -1,4 +1,5 @@ """Evaluate the enhanced signals using a combination of HASPI and HASQI metrics""" + import csv import hashlib import json diff --git a/recipes/icassp_2023/baseline/report_score.py b/recipes/icassp_2023/baseline/report_score.py index 6fd06217d..698dba877 100644 --- a/recipes/icassp_2023/baseline/report_score.py +++ b/recipes/icassp_2023/baseline/report_score.py @@ -1,4 +1,5 @@ """ Run the dummy enhancement. """ + import json import logging diff --git a/tests/conftest.py b/tests/conftest.py index 9149d521f..61bd95dc6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ """Fixtures for testing.""" + from __future__ import annotations from pathlib import Path diff --git a/tests/data/test_HOA_tools_cec2.py b/tests/data/test_HOA_tools_cec2.py index dbd31f82c..4bf402460 100644 --- a/tests/data/test_HOA_tools_cec2.py +++ b/tests/data/test_HOA_tools_cec2.py @@ -1,4 +1,5 @@ """Tests for the data.HOA_tools_cec2 module.""" + import numpy as np import pytest from numba.typed import List as TypedList # pylint: disable=no-name-in-module diff --git a/tests/data/test_utils.py b/tests/data/test_utils.py index 7f6f82c73..d1b0a78f4 100644 --- a/tests/data/test_utils.py +++ b/tests/data/test_utils.py @@ -1,4 +1,5 @@ """Tests for the data.utils module.""" + from __future__ import annotations import numpy as np diff --git a/tests/enhancer/gha/test_gainrule_camfit.py b/tests/enhancer/gha/test_gainrule_camfit.py index 9dc101558..a7fe9b50f 100644 --- a/tests/enhancer/gha/test_gainrule_camfit.py +++ b/tests/enhancer/gha/test_gainrule_camfit.py @@ -1,4 +1,5 @@ """Tests for enhancer.gha.gainrule_camfit module""" + import numpy as np import pytest diff --git a/tests/enhancer/gha/test_gha_interface.py b/tests/enhancer/gha/test_gha_interface.py index 59573f163..f8caf85d3 100644 --- a/tests/enhancer/gha/test_gha_interface.py +++ b/tests/enhancer/gha/test_gha_interface.py @@ -1,4 +1,5 @@ """Tests for enhancer.gha.gha_interface module""" + import hashlib import numpy as np diff --git a/tests/enhancer/gha/test_gha_utils.py b/tests/enhancer/gha/test_gha_utils.py index 147391ce7..378e8afc6 100644 --- a/tests/enhancer/gha/test_gha_utils.py +++ b/tests/enhancer/gha/test_gha_utils.py @@ -1,4 +1,5 @@ """Tests for enhancer.gha.gha_utils module""" + import hashlib import numpy as np diff --git a/tests/enhancer/test_nalr.py b/tests/enhancer/test_nalr.py index 93ad1b83c..5c889f242 100644 --- a/tests/enhancer/test_nalr.py +++ b/tests/enhancer/test_nalr.py @@ -1,4 +1,5 @@ """Tests for the enhancer.nalr module.""" + import numpy as np import pytest diff --git a/tests/evaluator/haaqi/test_haaqi.py b/tests/evaluator/haaqi/test_haaqi.py index bf29363e0..00458492d 100644 --- a/tests/evaluator/haaqi/test_haaqi.py +++ b/tests/evaluator/haaqi/test_haaqi.py @@ -1,4 +1,5 @@ """Tests for haaqi module""" + # pylint: disable=import-error import numpy as np import pytest diff --git a/tests/evaluator/haspi/test_eb.py b/tests/evaluator/haspi/test_eb.py index be375e51c..6f4f48b23 100644 --- a/tests/evaluator/haspi/test_eb.py +++ b/tests/evaluator/haspi/test_eb.py @@ -1,4 +1,5 @@ """Tests for eb module""" + import numpy as np import pytest diff --git a/tests/evaluator/haspi/test_ebm.py b/tests/evaluator/haspi/test_ebm.py index 27b5bf91e..3a1b57723 100644 --- a/tests/evaluator/haspi/test_ebm.py +++ b/tests/evaluator/haspi/test_ebm.py @@ -1,4 +1,5 @@ """Tests for ebm module""" + import numpy as np import pytest diff --git a/tests/evaluator/haspi/test_haspi.py b/tests/evaluator/haspi/test_haspi.py index e1c5b930b..1c6c6e2fa 100644 --- a/tests/evaluator/haspi/test_haspi.py +++ b/tests/evaluator/haspi/test_haspi.py @@ -1,4 +1,5 @@ """Tests for hasqi module""" + import numpy as np import pytest diff --git a/tests/evaluator/haspi/test_ip.py b/tests/evaluator/haspi/test_ip.py index c19d964cc..5423366cf 100644 --- a/tests/evaluator/haspi/test_ip.py +++ b/tests/evaluator/haspi/test_ip.py @@ -1,4 +1,5 @@ """Tests for ip module""" + import numpy as np import pytest diff --git a/tests/evaluator/hasqi/test_hasqi.py b/tests/evaluator/hasqi/test_hasqi.py index 959319479..9457c8d9d 100644 --- a/tests/evaluator/hasqi/test_hasqi.py +++ b/tests/evaluator/hasqi/test_hasqi.py @@ -1,4 +1,5 @@ """Tests for hasqi module""" + import numpy as np import pytest diff --git a/tests/evaluator/mbstoi/test_mbstoi_utils.py b/tests/evaluator/mbstoi/test_mbstoi_utils.py index 005c4691c..dfc4b578a 100644 --- a/tests/evaluator/mbstoi/test_mbstoi_utils.py +++ b/tests/evaluator/mbstoi/test_mbstoi_utils.py @@ -1,4 +1,5 @@ """Tests for mbstoi_utils module""" + import numpy as np import pytest diff --git a/tests/evaluator/msbg/test_msbg_utils.py b/tests/evaluator/msbg/test_msbg_utils.py index c292a0ad2..29e3633dd 100644 --- a/tests/evaluator/msbg/test_msbg_utils.py +++ b/tests/evaluator/msbg/test_msbg_utils.py @@ -1,4 +1,5 @@ """Tests for msbg_utils module""" + import numpy as np import pytest diff --git a/tests/evaluator/msbg/test_smearing.py b/tests/evaluator/msbg/test_smearing.py index 0ae93ae0b..949ad22f9 100644 --- a/tests/evaluator/msbg/test_smearing.py +++ b/tests/evaluator/msbg/test_smearing.py @@ -1,4 +1,5 @@ """Tests for smearing module""" + import numpy as np import pytest diff --git a/tests/predictor/test_torch_msbg.py b/tests/predictor/test_torch_msbg.py index 1633848df..f89534072 100644 --- a/tests/predictor/test_torch_msbg.py +++ b/tests/predictor/test_torch_msbg.py @@ -1,4 +1,5 @@ """Module for testing torch_msbg.py""" + import numpy as np import pytest import torch diff --git a/tests/predictor/test_torch_stoi.py b/tests/predictor/test_torch_stoi.py index 78a2bf347..9129f9f59 100644 --- a/tests/predictor/test_torch_stoi.py +++ b/tests/predictor/test_torch_stoi.py @@ -1,4 +1,5 @@ """Module for testing torch_stoi.py""" + import numpy as np import pytest import torch diff --git a/tests/recipes/cad1/task1/baseline/test_enhance_task1.py b/tests/recipes/cad1/task1/baseline/test_enhance_task1.py index 2b171815f..22f826785 100644 --- a/tests/recipes/cad1/task1/baseline/test_enhance_task1.py +++ b/tests/recipes/cad1/task1/baseline/test_enhance_task1.py @@ -1,4 +1,5 @@ """Tests for the enhance module""" + # pylint: disable=import-error from pathlib import Path diff --git a/tests/recipes/cad1/task1/baseline/test_evaluate.py b/tests/recipes/cad1/task1/baseline/test_evaluate.py index 8a3977d69..51e8023d8 100644 --- a/tests/recipes/cad1/task1/baseline/test_evaluate.py +++ b/tests/recipes/cad1/task1/baseline/test_evaluate.py @@ -1,4 +1,5 @@ """Tests for the evaluation module""" + from pathlib import Path # pylint: disable=import-error diff --git a/tests/recipes/cad1/task2/baseline/test_audio_manager.py b/tests/recipes/cad1/task2/baseline/test_audio_manager.py index 90d3675ac..319ffb2c5 100644 --- a/tests/recipes/cad1/task2/baseline/test_audio_manager.py +++ b/tests/recipes/cad1/task2/baseline/test_audio_manager.py @@ -1,4 +1,5 @@ """Test for AudioManager module""" + from pathlib import Path import numpy as np diff --git a/tests/recipes/cad1/task2/baseline/test_baseline_utils.py b/tests/recipes/cad1/task2/baseline/test_baseline_utils.py index 7f0d527b6..f4d3eae01 100644 --- a/tests/recipes/cad1/task2/baseline/test_baseline_utils.py +++ b/tests/recipes/cad1/task2/baseline/test_baseline_utils.py @@ -1,4 +1,5 @@ """Test for baseline_utils.py""" + from pathlib import Path # pylint: disable=import-error diff --git a/tests/recipes/cad1/task2/baseline/test_enhance_task2.py b/tests/recipes/cad1/task2/baseline/test_enhance_task2.py index aaa340c46..139682d67 100644 --- a/tests/recipes/cad1/task2/baseline/test_enhance_task2.py +++ b/tests/recipes/cad1/task2/baseline/test_enhance_task2.py @@ -1,4 +1,5 @@ """Test the enhance module.""" + # pylint: disable=import-error from pathlib import Path diff --git a/tests/recipes/cad1/task2/baseline/test_evaluate.py b/tests/recipes/cad1/task2/baseline/test_evaluate.py index 5cbb481ce..79c127bf1 100644 --- a/tests/recipes/cad1/task2/baseline/test_evaluate.py +++ b/tests/recipes/cad1/task2/baseline/test_evaluate.py @@ -1,4 +1,5 @@ """Tests for evaluate module""" + import pytest diff --git a/tests/recipes/cad1/task2/baseline/test_merge_batches.py b/tests/recipes/cad1/task2/baseline/test_merge_batches.py index 69747a6a5..2e325a966 100644 --- a/tests/recipes/cad1/task2/baseline/test_merge_batches.py +++ b/tests/recipes/cad1/task2/baseline/test_merge_batches.py @@ -1,4 +1,5 @@ """Test for merge_batches module""" + import pytest diff --git a/tests/recipes/cad1/task2/data_preparation/test_build_scene_metadata.py b/tests/recipes/cad1/task2/data_preparation/test_build_scene_metadata.py index 33b5c889e..a2ec60eb9 100644 --- a/tests/recipes/cad1/task2/data_preparation/test_build_scene_metadata.py +++ b/tests/recipes/cad1/task2/data_preparation/test_build_scene_metadata.py @@ -1,4 +1,5 @@ """Tests for the build_scene_metadata.py script""" + from pathlib import Path import numpy as np diff --git a/tests/recipes/cad_icassp_2024/baseline/test_enhance.py b/tests/recipes/cad_icassp_2024/baseline/test_enhance.py index 36fac0a43..e9278afac 100644 --- a/tests/recipes/cad_icassp_2024/baseline/test_enhance.py +++ b/tests/recipes/cad_icassp_2024/baseline/test_enhance.py @@ -1,4 +1,5 @@ """Tests for the enhance module""" + # pylint:: disable=import-error from pathlib import Path diff --git a/tests/recipes/cad_icassp_2024/baseline/test_evaluate.py b/tests/recipes/cad_icassp_2024/baseline/test_evaluate.py index a1e490149..fac6f46a6 100644 --- a/tests/recipes/cad_icassp_2024/baseline/test_evaluate.py +++ b/tests/recipes/cad_icassp_2024/baseline/test_evaluate.py @@ -1,4 +1,5 @@ """Tests for the enhance module""" + # pylint:: disable=import-error from pathlib import Path diff --git a/tests/recipes/cad_icassp_2024/generate_dataset/test_generate_at_mic_musdb18.py b/tests/recipes/cad_icassp_2024/generate_dataset/test_generate_at_mic_musdb18.py index 215b115cd..4943fb696 100644 --- a/tests/recipes/cad_icassp_2024/generate_dataset/test_generate_at_mic_musdb18.py +++ b/tests/recipes/cad_icassp_2024/generate_dataset/test_generate_at_mic_musdb18.py @@ -1,4 +1,5 @@ """Test the generate dataset script for the ICASSP 2024 CAD recipe.""" + # pylint:: disable=import-error from pathlib import Path diff --git a/tests/recipes/cad_icassp_2024/generate_dataset/test_generate_train_scenes.py b/tests/recipes/cad_icassp_2024/generate_dataset/test_generate_train_scenes.py index 287fe7709..46f456560 100644 --- a/tests/recipes/cad_icassp_2024/generate_dataset/test_generate_train_scenes.py +++ b/tests/recipes/cad_icassp_2024/generate_dataset/test_generate_train_scenes.py @@ -1,4 +1,5 @@ """Test the generate scenes script for the ICASSP 2024 CAD recipe.""" + # pylint:: disable=import-error import json diff --git a/tests/recipes/cec2/baseline/test_enhance.py b/tests/recipes/cec2/baseline/test_enhance.py index f1c54226f..187f28888 100644 --- a/tests/recipes/cec2/baseline/test_enhance.py +++ b/tests/recipes/cec2/baseline/test_enhance.py @@ -1,4 +1,5 @@ """Tests for cec2 baseline enhance module.""" + from __future__ import annotations from pathlib import Path diff --git a/tests/recipes/cec2/baseline/test_evaluate.py b/tests/recipes/cec2/baseline/test_evaluate.py index 3ea665956..f2cd938bf 100644 --- a/tests/recipes/cec2/baseline/test_evaluate.py +++ b/tests/recipes/cec2/baseline/test_evaluate.py @@ -1,4 +1,5 @@ """Tests for cec2 baseline evaluate module.""" + from __future__ import annotations from pathlib import Path diff --git a/tests/recipes/cec2/data_preparation/test_build_scenes.py b/tests/recipes/cec2/data_preparation/test_build_scenes.py index 359604304..d9b3a756c 100644 --- a/tests/recipes/cec2/data_preparation/test_build_scenes.py +++ b/tests/recipes/cec2/data_preparation/test_build_scenes.py @@ -1,4 +1,5 @@ """Tests for cec2 build_scenes module.""" + import json from pathlib import Path from unittest.mock import patch diff --git a/tests/recipes/cpc1/baseline/test_run.py b/tests/recipes/cpc1/baseline/test_run.py index 6d43f53c9..5a7b3076c 100644 --- a/tests/recipes/cpc1/baseline/test_run.py +++ b/tests/recipes/cpc1/baseline/test_run.py @@ -1,4 +1,5 @@ """Tests for cpc1 run module""" + from __future__ import annotations import csv diff --git a/tests/recipes/cpc2/baseline/test_compute_haspi.py b/tests/recipes/cpc2/baseline/test_compute_haspi.py index 5626e5a04..1f53f3018 100644 --- a/tests/recipes/cpc2/baseline/test_compute_haspi.py +++ b/tests/recipes/cpc2/baseline/test_compute_haspi.py @@ -1,6 +1,5 @@ """Tests for the haspi computation functions.""" - from pathlib import Path from unittest.mock import patch diff --git a/tests/recipes/icassp_2023/baseline/test_enhance.py b/tests/recipes/icassp_2023/baseline/test_enhance.py index fd1304be7..d0b1ed3cf 100644 --- a/tests/recipes/icassp_2023/baseline/test_enhance.py +++ b/tests/recipes/icassp_2023/baseline/test_enhance.py @@ -1,4 +1,5 @@ """Tests for icassp_2023 cec2 enhance module.""" + from __future__ import annotations from pathlib import Path diff --git a/tests/recipes/icassp_2023/baseline/test_evaluate.py b/tests/recipes/icassp_2023/baseline/test_evaluate.py index 245b6372a..b5d7fd61d 100644 --- a/tests/recipes/icassp_2023/baseline/test_evaluate.py +++ b/tests/recipes/icassp_2023/baseline/test_evaluate.py @@ -1,4 +1,5 @@ """Tests for icassp_2023 cec2 evaluate module""" + from __future__ import annotations import csv diff --git a/tests/recipes/icassp_2023/baseline/test_report_score.py b/tests/recipes/icassp_2023/baseline/test_report_score.py index d18725818..7f364a8e1 100644 --- a/tests/recipes/icassp_2023/baseline/test_report_score.py +++ b/tests/recipes/icassp_2023/baseline/test_report_score.py @@ -1,4 +1,5 @@ """Tests for icassp_2023 cec2 report score module""" + from __future__ import annotations from csv import DictWriter diff --git a/tests/regression/test_full_CEC1_pipeline.py b/tests/regression/test_full_CEC1_pipeline.py index fd6626659..56016a56e 100644 --- a/tests/regression/test_full_CEC1_pipeline.py +++ b/tests/regression/test_full_CEC1_pipeline.py @@ -1,4 +1,5 @@ """Tests the full CEC1 baseline pipeline""" + # pylint: disable=too-many-locals invalid-name # Regression test @@ -172,12 +173,12 @@ def test_full_cec1_pipeline(regtest): assert len(proc_pad) >= len(signal_processed) - clean_pad[ - int(delay[0]) : int(len(reference_processed) + int(delay[0])), 0 - ] = reference_processed[:, 0] - clean_pad[ - int(delay[1]) : int(len(reference_processed) + int(delay[1])), 1 - ] = reference_processed[:, 1] + clean_pad[int(delay[0]) : int(len(reference_processed) + int(delay[0])), 0] = ( + reference_processed[:, 0] + ) + clean_pad[int(delay[1]) : int(len(reference_processed) + int(delay[1])), 1] = ( + reference_processed[:, 1] + ) proc_pad[: len(signal_processed)] = signal_processed grid_coarseness = 1 diff --git a/tests/regression/test_full_CEC2_pipeline.py b/tests/regression/test_full_CEC2_pipeline.py index 1ccec30d3..ba30e9880 100644 --- a/tests/regression/test_full_CEC2_pipeline.py +++ b/tests/regression/test_full_CEC2_pipeline.py @@ -1,4 +1,5 @@ """Regression Tests for CEC2""" + # pylint: disable=too-many-locals invalid-name from __future__ import annotations diff --git a/tests/regression/test_mc_conv_tasnet.py b/tests/regression/test_mc_conv_tasnet.py index 51ca56bd6..d0ae0310a 100644 --- a/tests/regression/test_mc_conv_tasnet.py +++ b/tests/regression/test_mc_conv_tasnet.py @@ -1,4 +1,5 @@ """Test the ConvTasNet model.""" + import numpy as np import torch import torchaudio diff --git a/tests/regression/test_predictors.py b/tests/regression/test_predictors.py index 725dfcc01..fa06db6b4 100644 --- a/tests/regression/test_predictors.py +++ b/tests/regression/test_predictors.py @@ -1,4 +1,5 @@ """"Regression tests for Predictors""" + import re import pytest diff --git a/tests/utils/car_noise_simulator/test_carnoise_parameter_generator.py b/tests/utils/car_noise_simulator/test_carnoise_parameter_generator.py index b9f020c9c..1116c159c 100644 --- a/tests/utils/car_noise_simulator/test_carnoise_parameter_generator.py +++ b/tests/utils/car_noise_simulator/test_carnoise_parameter_generator.py @@ -1,4 +1,5 @@ """Tests for the Car noise parameters generator""" + # pylint: disable=import-error import numpy as np diff --git a/tests/utils/car_noise_simulator/test_carnoise_signal_generator.py b/tests/utils/car_noise_simulator/test_carnoise_signal_generator.py index 17a79a303..f5ecd546f 100644 --- a/tests/utils/car_noise_simulator/test_carnoise_signal_generator.py +++ b/tests/utils/car_noise_simulator/test_carnoise_signal_generator.py @@ -1,4 +1,5 @@ """Tests for the Car noise signal generator""" + # pylint: disable=import-error from pathlib import Path diff --git a/tests/utils/test_file_io.py b/tests/utils/test_file_io.py index dd0deea40..e17fd56ee 100644 --- a/tests/utils/test_file_io.py +++ b/tests/utils/test_file_io.py @@ -1,4 +1,5 @@ """Test the file_io module.""" + import numpy as np import pytest diff --git a/tests/utils/test_flac_encoder.py b/tests/utils/test_flac_encoder.py index 85aa1e8f0..fe2078535 100644 --- a/tests/utils/test_flac_encoder.py +++ b/tests/utils/test_flac_encoder.py @@ -1,4 +1,5 @@ """Tests for the FlacEncoder class.""" + # pylint: disable=import-error from pathlib import Path from tempfile import NamedTemporaryFile diff --git a/tests/utils/test_results_support.py b/tests/utils/test_results_support.py index 507de0206..0202957bb 100644 --- a/tests/utils/test_results_support.py +++ b/tests/utils/test_results_support.py @@ -1,4 +1,5 @@ """test for results support module""" + # pylint: disable=import-error from pathlib import Path diff --git a/tests/utils/test_signal_processing.py b/tests/utils/test_signal_processing.py index f0bb22470..8ffdc61f1 100644 --- a/tests/utils/test_signal_processing.py +++ b/tests/utils/test_signal_processing.py @@ -1,4 +1,5 @@ """Test for utils.signal_processing module""" + # pylint: disable=import-error import numpy as np import pytest diff --git a/tests/utils/test_source_separation_support.py b/tests/utils/test_source_separation_support.py index 60591a4b1..657131159 100644 --- a/tests/utils/test_source_separation_support.py +++ b/tests/utils/test_source_separation_support.py @@ -1,4 +1,5 @@ """ Test module for the source separation support""" + # pylint: disable=import-error from pathlib import Path