Merge pull request #787 from EveryVoiceTTS/dev.ej/relax-click

Make EveryVoice compatible with recent versions of click

Author: joanise

.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

.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

everyvoice/model/aligner/wav2vec2aligner

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

everyvoice/model/feature_prediction/FastSpeech2_lightning

@@ -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",