From 82e029529e2a514ebfef249b6e0aee87d825eff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Mon, 25 Jan 2021 13:27:54 +0100 Subject: [PATCH] fix manifest file --- Dockerfile | 20 -------------------- MANIFEST.in | 8 +++++++- TTS/bin/synthesize.py | 2 +- TTS/server/server.py | 2 +- setup.py | 3 ++- 5 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 43f2e9e9d..000000000 --- a/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM pytorch/pytorch:1.0.1-cuda10.0-cudnn7-runtime - -WORKDIR /srv/app - -RUN apt-get update && \ - apt-get install -y libsndfile1 espeak && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -# Copy Source later to enable dependency caching -COPY requirements.txt /srv/app/ -RUN pip install -r requirements.txt - -COPY . /srv/app - -# http://bugs.python.org/issue19846 -# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. -ENV LANG C.UTF-8 - -CMD python3.6 server/server.py -c server/conf.json diff --git a/MANIFEST.in b/MANIFEST.in index 416867eba..346c1436b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,10 @@ include README.md include LICENSE.txt include requirements.txt -include TTS/.models.json \ No newline at end of file +recursive-include TTS *.json +recursive-include TTS *.html +recursive-include TTS *.png +recursive-include TTS *.md +recursive-include notebooks *.ipynb +recursive-include images *.png + diff --git a/TTS/bin/synthesize.py b/TTS/bin/synthesize.py index 18bd6ac1c..bb9339d5e 100755 --- a/TTS/bin/synthesize.py +++ b/TTS/bin/synthesize.py @@ -143,7 +143,7 @@ def main(): args = parser.parse_args() # load model manager - path = Path(__file__).parent / "../../.models.json" + path = Path(__file__).parent / "../.models.json" manager = ModelManager(path) model_path = None diff --git a/TTS/server/server.py b/TTS/server/server.py index a89f40216..c579ff67b 100644 --- a/TTS/server/server.py +++ b/TTS/server/server.py @@ -47,7 +47,7 @@ def convert_boolean(x): args = create_argparser().parse_args() -path = Path(__file__).parent / "../../.models.json" +path = Path(__file__).parent / "../.models.json" manager = ModelManager(path) if args.list_models: diff --git a/setup.py b/setup.py index 573230dec..5504007c1 100644 --- a/setup.py +++ b/setup.py @@ -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.9a4' +version = '0.0.9a9' cwd = os.path.dirname(os.path.abspath(__file__)) # Handle Cython code @@ -105,6 +105,7 @@ def pip_install(package_name): long_description=README, long_description_content_type="text/markdown", license='MPL-2.0', + include_package_data = True, ext_modules=find_cython_extensions(), packages=find_packages(include=['TTS*']), project_urls={