From 8c74f054f0e2b1558f55f4d5b829e311b7a7fe0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Fri, 18 Jun 2021 14:57:05 +0200 Subject: [PATCH] =?UTF-8?q?Enable=20support=20for=20=F0=9F=90=8D=20python?= =?UTF-8?q?=203.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump up versions numpy 1.19.5 and TF 2.5.0 --- TTS/tts/datasets/__init__.py | 4 ---- pyproject.toml | 2 +- requirements.tf.txt | 2 +- requirements.txt | 2 +- setup.py | 5 ++--- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/TTS/tts/datasets/__init__.py b/TTS/tts/datasets/__init__.py index bcdbf6a6..cbae78a7 100644 --- a/TTS/tts/datasets/__init__.py +++ b/TTS/tts/datasets/__init__.py @@ -7,10 +7,6 @@ import numpy as np from TTS.tts.datasets.formatters import * from TTS.tts.datasets.TTSDataset import TTSDataset -#################### -# UTILITIES -#################### - def split_dataset(items): speakers = [item[-1] for item in items] diff --git a/pyproject.toml b/pyproject.toml index feaf5fd4..0941a906 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "wheel", "Cython", "numpy==1.18.5"] +requires = ["setuptools", "wheel", "Cython", "numpy==1.19.5"] [flake8] max-line-length=120 diff --git a/requirements.tf.txt b/requirements.tf.txt index 60f6e6c9..8e256a90 100644 --- a/requirements.tf.txt +++ b/requirements.tf.txt @@ -1 +1 @@ -tensorflow==2.3.1 +tensorflow==2.5.0 diff --git a/requirements.txt b/requirements.txt index 046139d0..7437b78a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ inflect jieba librosa==0.8.0 matplotlib -numpy==1.18.5 +numpy==1.19.5 pandas pypinyin pysbd diff --git a/setup.py b/setup.py index 7cfb6519..b4015455 100644 --- a/setup.py +++ b/setup.py @@ -11,9 +11,8 @@ import setuptools.command.develop from Cython.Build import cythonize from setuptools import Extension, find_packages, setup - if LooseVersion(sys.version) < LooseVersion("3.6") or LooseVersion(sys.version) > LooseVersion("3.9"): - raise RuntimeError("TTS requires python >= 3.6 and <3.9 " "but your Python version is {}".format(sys.version)) + raise RuntimeError("TTS requires python >= 3.6 and <=3.10 " "but your Python version is {}".format(sys.version)) cwd = os.path.dirname(os.path.abspath(__file__)) @@ -99,7 +98,7 @@ setup( "notebooks": requirements_notebooks, "tf": requirements_tf, }, - python_requires=">=3.6.0, <3.9", + python_requires=">=3.6.0, <3.10", entry_points={"console_scripts": ["tts=TTS.bin.synthesize:main", "tts-server = TTS.server.server:main"]}, classifiers=[ "Programming Language :: Python",