From d97eb9f7839635c1063bbb0b6d854b582b98c6e8 Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Thu, 13 Feb 2020 17:30:41 +0100 Subject: [PATCH] Fix linter and server package test --- server/synthesizer.py | 3 ++- setup.py | 7 ++++--- tests/test_server_package.sh | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/synthesizer.py b/server/synthesizer.py index 1082b73a..fcdc8787 100644 --- a/server/synthesizer.py +++ b/server/synthesizer.py @@ -121,7 +121,8 @@ class Synthesizer(object): wav = np.array(wav) self.ap.save_wav(wav, path) - def split_into_sentences(self, text): + @staticmethod + def split_into_sentences(text): text = " " + text + " " text = text.replace("\n", " ") text = re.sub(prefixes, "\\1", text) diff --git a/setup.py b/setup.py index 63782800..f92dac8a 100644 --- a/setup.py +++ b/setup.py @@ -61,10 +61,11 @@ package_data = ['server/templates/*'] if 'bdist_wheel' in unknown_args and args.checkpoint and args.model_config: print('Embedding model in wheel file...') model_dir = os.path.join('server', 'model') - os.makedirs(model_dir, exist_ok=True) - embedded_checkpoint_path = os.path.join(model_dir, 'checkpoint.pth.tar') + tts_dir = os.path.join(model_dir, 'tts') + os.makedirs(tts_dir, exist_ok=True) + embedded_checkpoint_path = os.path.join(tts_dir, 'checkpoint.pth.tar') shutil.copy(args.checkpoint, embedded_checkpoint_path) - embedded_config_path = os.path.join(model_dir, 'config.json') + embedded_config_path = os.path.join(tts_dir, 'config.json') shutil.copy(args.model_config, embedded_config_path) package_data.extend([embedded_checkpoint_path, embedded_config_path]) diff --git a/tests/test_server_package.sh b/tests/test_server_package.sh index 01e42843..9fe5e8b1 100755 --- a/tests/test_server_package.sh +++ b/tests/test_server_package.sh @@ -11,7 +11,7 @@ source /tmp/venv/bin/activate pip install --quiet --upgrade pip setuptools wheel rm -f dist/*.whl -python setup.py bdist_wheel --checkpoint tests/outputs/checkpoint_10.pth.tar --model_config tests/outputs/dummy_model_config.json +python setup.py --quiet bdist_wheel --checkpoint tests/outputs/checkpoint_10.pth.tar --model_config tests/outputs/dummy_model_config.json pip install --quiet dist/TTS*.whl python -m TTS.server.server &