small patches for problems recently introduced

.github/workflows/test.yml

@@ -170,7 +170,7 @@ jobs:
       - name: Run license check overall
         run: |
           licensecheck --requirements-paths pyproject.toml --zero \
-            --ignore-packages text-unidecode pympi-ling pyworld pyworld-prebuilt pysdtw audioread anytree gradio \
+            --ignore-packages text-unidecode pympi-ling pyworld pyworld-prebuilt pysdtw audioread anytree gradio hf-gradio \
             --skip-dependencies llvmlite \
             --ignore-licenses OTHER/PROPRIETARY || \
           ! echo "Package(s) listed with an X above is/are potentially a problem. Please review their licenses for compatibility with EveryVoice."

everyvoice/base_cli/helpers.py

@@ -17,7 +17,6 @@
 from deepdiff import DeepDiff
 from loguru import logger
 from pydantic import ValidationError
-from tqdm import tqdm
 
 from everyvoice.config.type_definitions import TargetTrainingTextRepresentationLevel
 from everyvoice.exceptions import InvalidConfiguration
@@ -190,6 +189,8 @@ def train_base_command(
     gradient_clip_val: float | None,
     model_kwargs={},
 ):
+    from tqdm import tqdm
+
     from everyvoice.base_cli.callback import ResetValidationDataloaderCallback
 
     config = load_config_base_command(model_config, config_args, config_file)

everyvoice/cli.py

@@ -895,7 +895,5 @@ def g2p(
         print(g2p(line))
 
 
-CLICK_APP = typer.main.get_group(app)
-
 if __name__ == "__main__":
     app()

everyvoice/tests/test_cli.py

@@ -112,9 +112,9 @@ def test_diagnostic(self):
         self.assertEqual(result.exit_code, 0)
         self.assertIn("EveryVoice version", result.stdout)
         self.assertIn("Python version", result.stdout)
-        # Check in the dependency list if we can find EveryVoice
-        # Start by removing `--diagnostic`'s header whic doesn't contain dependencies.
-        self.assertIn("everyvoice", "".join(result.stdout.lower().splitlines()[5:]))
+        # We can't really validate the whole dependency list, but we should at least find torch
+        # [5:] ignores the header generated by everyvoice --diagnostic and only looks at deps
+        self.assertIn("torch", "".join(result.stdout.lower().splitlines()[5:]))
 
     def wip_test_synthesize(self):
         # TODO: Here's a stub for getting synthesis unit tests working

make-everyvoice-env

@@ -225,13 +225,6 @@ if [[ $USE_UV ]]; then
     fi
 
     r uv pip install -e .[dev]
-
-    # Validation for libsox-dev
-    if python -c 'from torchaudio.sox_effects import apply_effects_tensor; apply_effects_tensor(None, 172, [])' 2>&1 | grep 'OSError: libsox'; then
-        error_exit "libsox.so not found. This will cause issues with audio pre-processing." \
-                   "Please install sox and its Python bindings, e.g., via libsox-dev, before running EveryVoice." \
-                   "See README.md for instructions, or else use make-everyvoice-env --conda instead of --uv."
-    fi
 else
     r conda create -y "${ENV_OPTION[@]}" python="$PYTHON_VERSION" ffmpeg
     eval "$(conda shell.bash hook)"

pyproject.toml

@@ -77,6 +77,7 @@ dependencies = [
   "PyYAML>=6.0",
   "readalongs>=1.2.0",
   "questionary>=2.0.0",
+  "setuptools<80",  # needed for tensorboard us to 2.20.0, should no longer be needed with next version
   "simple-term-menu==1.5.2",
   "tabulate==0.9.0",
   "tensorboard>=2.14.1",
@@ -209,9 +210,11 @@ check_untyped_defs = false
 [tool.pytest.ini_options]
 testpaths = [
   "everyvoice/tests",
-  "everyvoice/model/feature_prediction/FastSpeech2_lightning/fs2/tests",
-  "everyvoice/model/aligner/wav2vec2aligner/aligner/tests",
+  "everyvoice/**/tests",
 ]
 filterwarnings = [
   "ignore:Can't initialize NVML:UserWarning",
+  "ignore:.*use of fork.. may lead to deadlocks in the child.:DeprecationWarning",
+  "ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning",
+  "ignore:.*srun.*:UserWarning",
 ]