setup.py deps from requirements.txt

.gitignore

@@ -11,6 +11,9 @@
 *.npz
 *.done
 *.whl
+*.egg-info
+
+docs/build/
 
 tools/venv
 tools/kenlm

docs/requirements.txt

@@ -1,7 +0,0 @@
-myst_parser
-numpydoc
-recommonmark>=0.5.0
-sphinx
-sphinx-autobuild
-sphinx-markdown-tables
-sphinx_rtd_theme

parakeet/__init__.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.0.0"
 import logging
 from . import data
 from . import datasets

requirements.txt

@@ -12,7 +12,6 @@ sacrebleu
 scipy==1.2.1
 sentencepiece
 snakeviz
-SoundFile==0.9.0.post1
 sox
 tensorboardX
 textgrid
@@ -20,3 +19,24 @@ tqdm
 typeguard
 visualdl==2.2.0
 yacs
+numpy
+nltk
+inflect
+librosa
+unidecode
+numba
+llvmlite
+matplotlib
+pandas
+soundfile~=0.10
+g2p_en
+pypinyin
+webrtcvad
+g2pM
+praatio~=4.1
+h5py
+timer
+pyworld
+jieba
+phkit
+

setup.py

@@ -20,67 +20,33 @@ from setuptools import setup
 
 
 def read(*names, **kwargs):
-    with io.open(
+    with io.open(os.path.join(os.path.dirname(__file__), *names),
-            os.path.join(os.path.dirname(__file__), *names),
+                 encoding=kwargs.get("encoding", "utf8")) as fp:
-            encoding=kwargs.get("encoding", "utf8")) as fp:
         return fp.read()
 
 
-def find_version(*file_paths):
+VERSION = '2.1.2'
-    version_file = read(*file_paths)
-    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
-                              version_file, re.M)
-    if version_match:
-        return version_match.group(1)
-    raise RuntimeError("Unable to find version string.")
-
-
-VERSION = find_version('parakeet', '__init__.py')
 long_description = read("README.md")
+deps = [d.strip() for d in read('requirements.txt').split()]
 
 setup_info = dict(
     # Metadata
-    name='paddle-parakeet',
+    name='paddle-speech',
     version=VERSION,
-    author='PaddleSL Team',
+    author='PaddleSL Speech Team',
     author_email='',
-    url='https://github.com/PaddlePaddle',
+    url='https://github.com/PaddlePaddle/DeepSpeech',
-    description='Speech synthesis tools and models based on Paddlepaddle',
+    description='Speech tools and models based on Paddlepaddle',
     long_description=long_description,
     long_description_content_type="text/markdown",
     license='Apache 2',
     python_requires='>=3.6',
-    install_requires=[
+    install_requires=deps,
-        'numpy',
-        'nltk',
-        'inflect',
-        'librosa',
-        'unidecode',
-        'numba',
-        'tqdm',
-        'llvmlite',
-        'matplotlib',
-        'visualdl==2.2.0',
-        'scipy',
-        'pandas',
-        'sox',
-        'soundfile~=0.10',
-        'g2p_en',
-        'yacs',
-        'pypinyin',
-        'webrtcvad',
-        'g2pM',
-        'praatio~=4.1',
-        "h5py",
-        "timer",
-        'jsonlines',
-        'pyworld',
-        'typeguard',
-        'jieba',
-        "phkit",
-    ],
     extras_require={
-        'doc': ["sphinx", "sphinx-rtd-theme", "numpydoc"],
+        'doc': [
+            "sphinx", "sphinx-rtd-theme", "numpydoc", "myst_parser",
+            "recommonmark>=0.5.0", "sphinx-markdown-tables", "sphinx-autobuild"
+        ],
     },
 
     # Package info
@@ -94,6 +60,8 @@ setup_info = dict(
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
-    ], )
+        'Programming Language :: Python :: 3.8',
+    ],
+)
 
 setup(**setup_info)