Skip to content

Commit

Permalink
fixing dome pypi issues
Browse files Browse the repository at this point in the history
  • Loading branch information
erogol committed Jan 25, 2021
1 parent 60c1bb9 commit 57b668f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 17 deletions.
4 changes: 4 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
include README.md
include LICENSE.txt
include requirements.txt
include TTS/.models.json
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Please use our dedicated channels for questions and discussion. Help is much mor
You can also help us implement more models. Some TTS related work can be found [here](https://github.com/erogol/TTS-papers).

## Install TTS
TTS supports **python >= 3.6**.
TTS supports **python >= 3.6, <3.9**.

```pip install .``` or ```pip install -e .``` to keep your installation in your working directory.

Expand Down
File renamed without changes.
Empty file added TTS/bin/__init__.py
Empty file.
23 changes: 7 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import sys
import numpy

from setuptools import setup, find_packages, Extension
from setuptools import setup, find_packages
import setuptools.command.develop
import setuptools.command.build_py

Expand All @@ -33,7 +33,7 @@ def cythonize(*args, **kwargs): #pylint: disable=redefined-outer-name
# Remove our arguments from argv so that setuptools doesn't see them
sys.argv = [sys.argv[0]] + unknown_args

version = '0.0.9a0'
version = '0.0.9a4'
cwd = os.path.dirname(os.path.abspath(__file__))

# Handle Cython code
Expand Down Expand Up @@ -91,11 +91,7 @@ def pip_install(package_name):
subprocess.call([sys.executable, '-m', 'pip', 'install', package_name])


reqs_from_file = open('requirements.txt').readlines()
# reqs_without_tf = [r for r in reqs_from_file if not r.startswith('tensorflow')]
# tf_req = [r for r in reqs_from_file if r.startswith('tensorflow')]
# requirements = {'install_requires': reqs_without_tf, 'pip_install': tf_req}

requirements = open(os.path.join(cwd, 'requirements.txt'), 'r').readlines()
with open('README.md', "r", encoding="utf-8") as readme_file:
README = readme_file.read()

Expand All @@ -106,7 +102,8 @@ def pip_install(package_name):
author='Eren Gölge',
author_email='egolge@mozilla.com',
description='Text to Speech with Deep Learning',
# long_description=README,
long_description=README,
long_description_content_type="text/markdown",
license='MPL-2.0',
ext_modules=find_cython_extensions(),
packages=find_packages(include=['TTS*']),
Expand All @@ -120,8 +117,8 @@ def pip_install(package_name):
'build_py': build_py,
'develop': develop,
},
install_requires=reqs_from_file,
python_requires='>=3.6.0',
install_requires=requirements,
python_requires='>=3.6.0, <3.9',
entry_points={
'console_scripts': [
'tts=TTS.bin.synthesize:main',
Expand All @@ -147,9 +144,3 @@ def pip_install(package_name):
"Topic :: Multimedia",
"Topic :: Scientific/Engineering :: Artificial Intelligence"
])

# for some reason having tensorflow in 'install_requires'
# breaks some of the dependencies.
# if 'bdist_wheel' not in unknown_args:
# for module in requirements['pip_install']:
# pip_install(module)

0 comments on commit 57b668f

Please sign in to comment.