From d64157160ae105d69b53d2ece96d317cc11b1a59 Mon Sep 17 00:00:00 2001 From: Eric Joanis Date: Wed, 15 Apr 2026 17:27:54 -0400 Subject: [PATCH 1/4] ci: bump some pinned actions --- .github/workflows/matrix-tests.yml | 4 ++-- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/matrix-tests.yml b/.github/workflows/matrix-tests.yml index 11b66321..8673ffce 100644 --- a/.github/workflows/matrix-tests.yml +++ b/.github/workflows/matrix-tests.yml @@ -24,7 +24,7 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: "pip" - - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # v1.5.3 + - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1.6.0 with: packages: sox libsox-dev - uses: FedericoCarboni/setup-ffmpeg@583042d32dd1cabb8bd09df03bde06080da5c87c # v2 @@ -51,7 +51,7 @@ jobs: with: submodules: recursive - name: Set up conda - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0 + uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0 with: python-version: ${{ matrix.python-version }} miniforge-version: latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e3bfbb85..6218f321 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v6 with: submodules: recursive - - uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # v1.5.3 + - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1.6.0 with: packages: sox libsox-dev - name: Verify SoX installation From 045153fb817ca163fb9d9fbf146731effc47487b Mon Sep 17 00:00:00 2001 From: Eric Joanis Date: Thu, 16 Apr 2026 11:01:50 -0400 Subject: [PATCH 2/4] build(deps): allow recent click and fastapi versions --- pyproject.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3d89b3cc..6367c298 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,12 +46,7 @@ dependencies = [ "clipdetect>=0.1.4", "deepdiff>=6.5.0", "anytree>=2.12.1", - "click<8.2.0", "einops==0.5.0", - # FastAPI 0.119.0 removes Pydantic v1 support but somehow breaks Pydantic 2.7 compatibility - # We don't directly use fastapi but we indirectly depend on it through gradio and readalongs - # and we need to pin it to avoid breaking loading EveryVoice models. - "fastapi<0.119.0", "g2p>=2.3.1,<3", "gradio>=5.9.1", "grapheme>=0.6.0", From 252563acd5fe3794000e3e4d9c998a664c2f9deb Mon Sep 17 00:00:00 2001 From: Eric Joanis Date: Thu, 16 Apr 2026 11:38:51 -0400 Subject: [PATCH 3/4] fix(tests): make tests compatible with recent click versions --- everyvoice/tests/test_subsample.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/everyvoice/tests/test_subsample.py b/everyvoice/tests/test_subsample.py index f8848dfa..3b92ee79 100755 --- a/everyvoice/tests/test_subsample.py +++ b/everyvoice/tests/test_subsample.py @@ -88,9 +88,9 @@ def test_error_validation(self): app, [str(self.metadata_path), str(self.wavs_path), "-d", "7", "-f", "txt"] ) self.assertNotEqual(result.exit_code, 0) - self.assertIn("Invalid value for", result.stdout) + self.assertIn("Invalid value for", result.output) self.assertRegex( - result.stdout, + result.output, r"(?s)txt is not one of psv tsv csv festival".replace(" ", r".*"), ) @@ -115,7 +115,7 @@ def test_error_validation(self): self.assertNotEqual(result.exit_code, 0) self.assertRegex( - result.stdout, + result.output, r"Invalid value: Festival formatted files cannot have a speaker id.".replace( " ", r"[\s\S]*" ), @@ -137,7 +137,7 @@ def test_error_validation(self): ) self.assertNotEqual(result.exit_code, 0) self.assertRegex( - result.stdout, + result.output, r"A \.wav file could not be found".replace(" ", r"[\s\S]*"), ) From 4538096b705040f0b26c4ddba6d9fe29b2852f5f Mon Sep 17 00:00:00 2001 From: Eric Joanis Date: Mon, 20 Apr 2026 15:03:30 -0400 Subject: [PATCH 4/4] chore: update submodules to make fs2/w2v2a tests compat with recent click --- everyvoice/model/aligner/wav2vec2aligner | 2 +- everyvoice/model/feature_prediction/FastSpeech2_lightning | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/everyvoice/model/aligner/wav2vec2aligner b/everyvoice/model/aligner/wav2vec2aligner index d226221d..21043241 160000 --- a/everyvoice/model/aligner/wav2vec2aligner +++ b/everyvoice/model/aligner/wav2vec2aligner @@ -1 +1 @@ -Subproject commit d226221d1f6faba7e7dc20d77d74c1fded67a95c +Subproject commit 21043241932e94f3176431b7f9e708b7b15a8f2e diff --git a/everyvoice/model/feature_prediction/FastSpeech2_lightning b/everyvoice/model/feature_prediction/FastSpeech2_lightning index 46d09ab1..2fd127b1 160000 --- a/everyvoice/model/feature_prediction/FastSpeech2_lightning +++ b/everyvoice/model/feature_prediction/FastSpeech2_lightning @@ -1 +1 @@ -Subproject commit 46d09ab17a300fb0e7a6210d26fabb52dde16b2e +Subproject commit 2fd127b16dd82dcea406f53bb9c2f913974cd96e