Skip to content

Make EveryVoice compatible with recent versions of click #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joanise merged 4 commits into from
Apr 20, 2026
Merged

Make EveryVoice compatible with recent versions of click #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d641571
ci: bump some pinned actions
joanise Apr 15, 2026
045153f
build(deps): allow recent click and fastapi versions
joanise Apr 16, 2026
252563a
fix(tests): make tests compatible with recent click versions
joanise Apr 16, 2026
4538096
chore: update submodules to make fs2/w2v2a tests compat with recent c…
joanise Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/matrix-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion everyvoice/model/aligner/wav2vec2aligner
Open in desktop
Submodule wav2vec2aligner updated 1 files
+4 −4 aligner/tests/test_cli.py
2 changes: 1 addition & 1 deletion everyvoice/model/feature_prediction/FastSpeech2_lightning
Open in desktop
Submodule FastSpeech2_lightning updated 3 files
+1 −1 .github/workflows/test.yml
+1 −1 fs2/model.py
+3 −3 fs2/tests/test_cli.py
8 changes: 4 additions & 4 deletions everyvoice/tests/test_subsample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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".*"),
)

Expand All @@ -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]*"
),
Expand All @@ -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]*"),
)

Expand Down
5 changes: 0 additions & 5 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading