Merge pull request #12 from idiap/dev

v0.23.1

.github/workflows/pypi-release.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -81,6 +81,10 @@ jobs:
         with:
           name: "wheel-3.11"
           path: "dist/"
+      - uses: actions/download-artifact@v4
+        with:
+          name: "wheel-3.12"
+          path: "dist/"
       - run: |
           ls -lh dist/
       - name: Publish package distributions to PyPI

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, "3.10", "3.11"]
+        python-version: [3.9, "3.10", "3.11", "3.12"]
         subset: ["data_tests", "inference_tests", "test_aux", "test_text", "test_tts", "test_tts2", "test_vocoder", "test_xtts", "test_zoo0", "test_zoo1", "test_zoo2"]
     steps:
       - uses: actions/checkout@v4
@@ -38,14 +38,14 @@ jobs:
           sudo apt-get install -y --no-install-recommends git make gcc
           make system-deps
       - name: Install/upgrade Python setup deps
-        run: python3 -m pip install --upgrade pip setuptools wheel
+        run: python3 -m pip install --upgrade pip setuptools wheel uv
       - name: Replace scarf urls
         if: contains(fromJSON('["data_tests", "inference_tests", "test_aux", "test_tts", "test_tts2", "test_xtts", "test_zoo0", "test_zoo1", "test_zoo2"]'), matrix.subset)
         run: |
           sed -i 's/https:\/\/coqui.gateway.scarf.sh\//https:\/\/github.com\/coqui-ai\/TTS\/releases\/download\//g' TTS/.models.json
       - name: Install TTS
         run: |
-          python3 -m pip install .[all]
+          python3 -m uv pip install --system "coqui-tts[dev,server,ja] @ ."
           python3 setup.py egg_info
       - name: Unit tests
         run: make ${{ matrix.subset }}
@@ -63,7 +63,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - uses: actions/download-artifact@v4
         with:
           pattern: coverage-data-*

README.md

@@ -131,7 +131,7 @@ Please use our dedicated channels for questions and discussion. Help is much mor
 You can also help us implement more models.
 
 ## Installation
-🐸TTS is tested on Ubuntu 22.04 with **python >= 3.9, < 3.12.**.
+🐸TTS is tested on Ubuntu 22.04 with **python >= 3.9, < 3.13.**.
 
 If you are only interested in [synthesizing speech](https://coqui-tts.readthedocs.io/en/latest/inference.html) with the released 🐸TTS models, installing from PyPI is the easiest option.
 

TTS/VERSION

@@ -1 +1 @@
-0.23.0
+0.23.1

TTS/tts/utils/languages.py

@@ -1,5 +1,5 @@
 import os
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 import fsspec
 import numpy as np
@@ -85,18 +85,18 @@ def save_ids_to_file(self, file_path: str) -> None:
         self._save_json(file_path, self.name_to_id)
 
     @staticmethod
-    def init_from_config(config: Coqpit) -> "LanguageManager":
+    def init_from_config(config: Coqpit) -> Optional["LanguageManager"]:
         """Initialize the language manager from a Coqpit config.
 
         Args:
             config (Coqpit): Coqpit config.
         """
-        language_manager = None
         if check_config_and_model_args(config, "use_language_embedding", True):
             if config.get("language_ids_file", None):
-                language_manager = LanguageManager(language_ids_file_path=config.language_ids_file)
-            language_manager = LanguageManager(config=config)
-        return language_manager
+                return LanguageManager(language_ids_file_path=config.language_ids_file)
+            # Fall back to parse language IDs from the config
+            return LanguageManager(config=config)
+        return None
 
 
 def _set_file_path(path):

docs/source/installation.md

@@ -1,6 +1,6 @@
 # Installation
 
-🐸TTS supports python >=3.9 <3.12.0 and was tested on Ubuntu 20.04 and 22.04.
+🐸TTS supports python >=3.9 <3.13.0 and was tested on Ubuntu 22.04.
 
 ## Using `pip`
 

requirements.ja.txt

@@ -1,5 +1,5 @@
 # These cause some compatibility issues on some systems and are not strictly necessary
 # japanese g2p deps
-mecab-python3==1.0.6
+mecab-python3
 unidic-lite==1.0.8
 cutlet

requirements.txt

@@ -19,7 +19,7 @@ umap-learn>=0.5.1
 # deps for training
 matplotlib>=3.7.0
 # coqui stack
-trainer>=0.0.36
+coqui-tts-trainer>=0.1
 # config management
 coqpit>=0.0.16
 # chinese g2p deps

setup.py

@@ -28,13 +28,10 @@
 import setuptools.command.build_py
 import setuptools.command.develop
 from Cython.Build import cythonize
-from packaging.version import Version
 from setuptools import Extension, find_packages, setup
 
-python_version = sys.version.split()[0]
-if Version(python_version) < Version("3.9") or Version(python_version) >= Version("3.12"):
-    raise RuntimeError("TTS requires python >= 3.9 and < 3.12 " "but your Python version is {}".format(sys.version))
-
+if sys.version_info < (3, 9) or sys.version_info >= (3, 13):
+    raise RuntimeError("Trainer requires python >= 3.6 and <3.13 " "but your Python version is {}".format(sys.version))
 
 cwd = os.path.dirname(os.path.abspath(__file__))
 with open(os.path.join(cwd, "TTS", "VERSION")) as fin:
@@ -121,14 +118,15 @@ def pip_install(package_name):
         "server": requirements_server,
         "ja": requirements_ja,
     },
-    python_requires=">=3.9.0, <3.12",
+    python_requires=">=3.9.0, <3.13",
     entry_points={"console_scripts": ["tts=TTS.bin.synthesize:main", "tts-server = TTS.server.server:main"]},
     classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Science/Research",
         "Intended Audience :: Developers",