diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index fc990826..015ad77e 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -36,7 +36,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -64,10 +64,6 @@ jobs: with: name: "sdist" path: "dist/" - - uses: actions/download-artifact@v2 - with: - name: "wheel-3.7" - path: "dist/" - uses: actions/download-artifact@v2 with: name: "wheel-3.8" @@ -80,6 +76,10 @@ jobs: with: name: "wheel-3.10" path: "dist/" + - uses: actions/download-artifact@v2 + with: + name: "wheel-3.11" + path: "dist/" - run: | ls -lh dist/ - name: Setup PyPI config diff --git a/TTS/utils/manage.py b/TTS/utils/manage.py index d648510d..dca936b8 100644 --- a/TTS/utils/manage.py +++ b/TTS/utils/manage.py @@ -327,7 +327,9 @@ class ModelManager(object): # find downloaded files output_model_path = output_path output_config_path = None - if model not in ["tortoise-v2", "bark"] and "fairseq" not in model_name: # TODO:This is stupid but don't care for now. + if ( + model not in ["tortoise-v2", "bark"] and "fairseq" not in model_name + ): # TODO:This is stupid but don't care for now. output_model_path, output_config_path = self._find_files(output_path) # update paths in the config.json self._update_paths(output_path, output_config_path) diff --git a/pyproject.toml b/pyproject.toml index 8bc91b45..8544bb20 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "wheel", "cython==0.29.28", "numpy==1.21.6", "packaging"] +requires = ["setuptools", "wheel", "cython==0.29.30", "numpy==1.22.0", "packaging"] [flake8] max-line-length=120 diff --git a/requirements.txt b/requirements.txt index c450ff20..847f5399 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,15 @@ # core deps -numpy==1.21.6;python_version<"3.10" -numpy;python_version=="3.10" -cython==0.29.28 +numpy==1.22.0 +numpy==1.22.0 +cython==0.29.30 scipy>=1.4.0 torch>=1.7 torchaudio soundfile librosa==0.10.0.* numba==0.55.1;python_version<"3.9" -numba==0.56.4;python_version>="3.9" +numba==0.56.4;python_version<="3.10" +numba==0.57.1;python_version>"3.10" inflect==5.6.0 tqdm anyascii @@ -26,14 +27,14 @@ pandas # deps for training matplotlib # coqui stack -trainer==0.0.20 +trainer # config management coqpit>=0.0.16 # chinese g2p deps jieba pypinyin # japanese g2p deps -mecab-python3==1.0.5 +mecab-python3==1.0.6 unidic-lite==1.0.8 # gruut+supported langs gruut[de,es,fr]==2.2.3 diff --git a/setup.cfg b/setup.cfg index 2344c8b2..1f31cb5d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,8 +1,8 @@ [build_py] -build-lib=temp_build +build_lib=temp_build [bdist_wheel] -bdist-dir=temp_build +bdist_dir=temp_build [install_lib] -build-dir=temp_build +build_dir=temp_build diff --git a/setup.py b/setup.py index 259c3cd1..1d3038bd 100644 --- a/setup.py +++ b/setup.py @@ -32,8 +32,8 @@ from Cython.Build import cythonize from setuptools import Extension, find_packages, setup python_version = sys.version.split()[0] -if Version(python_version) < Version("3.7") or Version(python_version) >= Version("3.11"): - raise RuntimeError("TTS requires python >= 3.7 and < 3.11 " "but your Python version is {}".format(sys.version)) +if Version(python_version) < Version("3.8") or Version(python_version) >= Version("3.12"): + raise RuntimeError("TTS requires python >= 3.8 and < 3.12 " "but your Python version is {}".format(sys.version)) cwd = os.path.dirname(os.path.abspath(__file__)) @@ -114,15 +114,15 @@ setup( "dev": requirements_dev, "notebooks": requirements_notebooks, }, - python_requires=">=3.7.0, <3.11", + python_requires=">=3.8.0, <3.12", 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.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Development Status :: 3 - Alpha", "Intended Audience :: Science/Research", "Intended Audience :: Developers",