From 831351e6cb8f2e5c3b7def91ee1211008e672854 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 5 Jul 2022 02:44:45 -0400 Subject: [PATCH] adjust imports (tests still work with change) --- tts/pyproject.toml | 5 +++++ tts/text/pipeline/english_pipeline_v1.py | 14 +++++++------- tts/text/pipeline/legacy_fakeyou_pipeline.py | 8 ++++---- tts/text/pipeline/test_english_pipeline_v1.py | 6 +++--- tts/text/pipeline/test_legacy_fakeyou_pipeline.py | 2 +- .../input_parsing/test_parser.py | 2 +- .../normalization/english_normalization.py | 8 ++++---- .../normalization/spanish_normalization.py | 6 +++--- .../normalization/test_english_normalization.py | 2 +- .../phonetization/base_phonetization.py | 2 +- .../phonetization/english_phonetization.py | 6 +++--- .../phonetization/test_cmudict.py | 4 ++-- .../phonetization/test_english_phonetization.py | 8 ++++---- .../sequencing/english_symbols_v1.py | 2 +- .../sequencing/test_english_symbols_v1.py | 2 +- tts/vocodes_common.py | 9 +++++---- 16 files changed, 46 insertions(+), 40 deletions(-) diff --git a/tts/pyproject.toml b/tts/pyproject.toml index df6211e..46e7cea 100644 --- a/tts/pyproject.toml +++ b/tts/pyproject.toml @@ -3,3 +3,8 @@ [build-system] requires = ["setuptools>=42", "wheel"] build-backend = "setuptools.build_meta" + +[tool.pytest.ini_options] +pythonpath = [ + "." +] diff --git a/tts/text/pipeline/english_pipeline_v1.py b/tts/text/pipeline/english_pipeline_v1.py index 3af6ed9..9f6ea90 100644 --- a/tts/text/pipeline/english_pipeline_v1.py +++ b/tts/text/pipeline/english_pipeline_v1.py @@ -1,11 +1,11 @@ from typing import List -from tts.text.pipeline.base_pipeline import BasePipeline -from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence, parse_grapheme_and_arpabet_sequence -from tts.text.pipeline_components.normalization.english_normalization import normalize_english -from tts.text.pipeline_components.phonetization.base_phonetization import BasePhonetization -from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict -from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization -from tts.text.pipeline_components.sequencing.english_symbols_v1 import SPACE_INTEGER_ENCODING, arpabet_to_sequence, symbols_to_sequence +from text.pipeline.base_pipeline import BasePipeline +from text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence, parse_grapheme_and_arpabet_sequence +from text.pipeline_components.normalization.english_normalization import normalize_english +from text.pipeline_components.phonetization.base_phonetization import BasePhonetization +from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict +from text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization +from text.pipeline_components.sequencing.english_symbols_v1 import SPACE_INTEGER_ENCODING, arpabet_to_sequence, symbols_to_sequence class EnglishPipelineV1(BasePipeline): """ diff --git a/tts/text/pipeline/legacy_fakeyou_pipeline.py b/tts/text/pipeline/legacy_fakeyou_pipeline.py index c6756ad..a99e4db 100644 --- a/tts/text/pipeline/legacy_fakeyou_pipeline.py +++ b/tts/text/pipeline/legacy_fakeyou_pipeline.py @@ -1,9 +1,9 @@ import re from typing import List -from tts.text.pipeline.base_pipeline import BasePipeline -from tts.text.pipeline_components.normalization.common_cleaners import collapse_whitespace, convert_to_ascii, lowercase -from tts.text.pipeline_components.normalization.english_cleaners import expand_abbreviations, expand_numbers -from tts.text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence +from text.pipeline.base_pipeline import BasePipeline +from text.pipeline_components.normalization.common_cleaners import collapse_whitespace, convert_to_ascii, lowercase +from text.pipeline_components.normalization.english_cleaners import expand_abbreviations, expand_numbers +from text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence # Regular expression matching text enclosed in curly braces: _curly_re = re.compile(r'(.*?)\{(.+?)\}(.*)') diff --git a/tts/text/pipeline/test_english_pipeline_v1.py b/tts/text/pipeline/test_english_pipeline_v1.py index 6bec91c..8cc92e7 100644 --- a/tts/text/pipeline/test_english_pipeline_v1.py +++ b/tts/text/pipeline/test_english_pipeline_v1.py @@ -1,6 +1,6 @@ -from tts.text.pipeline.english_pipeline_v1 import EnglishPipelineV1 -from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict -from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization +from text.pipeline.english_pipeline_v1 import EnglishPipelineV1 +from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict +from text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization class TestEnglishPipelineV1: diff --git a/tts/text/pipeline/test_legacy_fakeyou_pipeline.py b/tts/text/pipeline/test_legacy_fakeyou_pipeline.py index 57432ff..4009e33 100644 --- a/tts/text/pipeline/test_legacy_fakeyou_pipeline.py +++ b/tts/text/pipeline/test_legacy_fakeyou_pipeline.py @@ -1,5 +1,5 @@ -from tts.text.pipeline.legacy_fakeyou_pipeline import LegacyFakeYouPipeline +from text.pipeline.legacy_fakeyou_pipeline import LegacyFakeYouPipeline class TestLegacyFakeYouPipeline(): diff --git a/tts/text/pipeline_components/input_parsing/test_parser.py b/tts/text/pipeline_components/input_parsing/test_parser.py index 175b0d9..e8115ee 100644 --- a/tts/text/pipeline_components/input_parsing/test_parser.py +++ b/tts/text/pipeline_components/input_parsing/test_parser.py @@ -1,4 +1,4 @@ -from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, parse_grapheme_and_arpabet_sequence +from text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, parse_grapheme_and_arpabet_sequence class TestParser: diff --git a/tts/text/pipeline_components/normalization/english_normalization.py b/tts/text/pipeline_components/normalization/english_normalization.py index c23d6f6..06f4e47 100644 --- a/tts/text/pipeline_components/normalization/english_normalization.py +++ b/tts/text/pipeline_components/normalization/english_normalization.py @@ -1,7 +1,7 @@ -from tts.text.pipeline_components.normalization.common_cleaners import collapse_whitespace -from tts.text.pipeline_components.normalization.common_cleaners import convert_to_ascii -from tts.text.pipeline_components.normalization.common_cleaners import lowercase -from tts.text.pipeline_components.normalization.english_cleaners import expand_abbreviations, expand_numbers +from text.pipeline_components.normalization.common_cleaners import collapse_whitespace +from text.pipeline_components.normalization.common_cleaners import convert_to_ascii +from text.pipeline_components.normalization.common_cleaners import lowercase +from text.pipeline_components.normalization.english_cleaners import expand_abbreviations, expand_numbers def normalize_english(raw_input_text: str) -> str: text = convert_to_ascii(raw_input_text) diff --git a/tts/text/pipeline_components/normalization/spanish_normalization.py b/tts/text/pipeline_components/normalization/spanish_normalization.py index 5d6db2a..fc92ee7 100644 --- a/tts/text/pipeline_components/normalization/spanish_normalization.py +++ b/tts/text/pipeline_components/normalization/spanish_normalization.py @@ -1,6 +1,6 @@ -from tts.text.pipeline_components.normalization.common_cleaners import collapse_whitespace -from tts.text.pipeline_components.normalization.common_cleaners import convert_to_ascii -from tts.text.pipeline_components.normalization.common_cleaners import lowercase +from text.pipeline_components.normalization.common_cleaners import collapse_whitespace +from text.pipeline_components.normalization.common_cleaners import convert_to_ascii +from text.pipeline_components.normalization.common_cleaners import lowercase def normalize_spanish(raw_input_text: str) -> str: text = convert_to_ascii(raw_input_text) diff --git a/tts/text/pipeline_components/normalization/test_english_normalization.py b/tts/text/pipeline_components/normalization/test_english_normalization.py index f8381ef..82e7f4e 100644 --- a/tts/text/pipeline_components/normalization/test_english_normalization.py +++ b/tts/text/pipeline_components/normalization/test_english_normalization.py @@ -1,4 +1,4 @@ -from tts.text.pipeline_components.normalization.english_normalization import normalize_english +from text.pipeline_components.normalization.english_normalization import normalize_english class TestEnglishNormalization: diff --git a/tts/text/pipeline_components/phonetization/base_phonetization.py b/tts/text/pipeline_components/phonetization/base_phonetization.py index d8c2ca5..add1611 100644 --- a/tts/text/pipeline_components/phonetization/base_phonetization.py +++ b/tts/text/pipeline_components/phonetization/base_phonetization.py @@ -1,7 +1,7 @@ import re from typing import List -from tts.text.pipeline_components.phonetization.cmudict import CMUDict +from text.pipeline_components.phonetization.cmudict import CMUDict # Regex taken from open source tacotron2 extensions _arpabet_split_re = re.compile(r'[^\s]*{.*?}[^\s]*|[\w]+|[^\w\s]+') diff --git a/tts/text/pipeline_components/phonetization/english_phonetization.py b/tts/text/pipeline_components/phonetization/english_phonetization.py index d09fa7e..a2ac90c 100644 --- a/tts/text/pipeline_components/phonetization/english_phonetization.py +++ b/tts/text/pipeline_components/phonetization/english_phonetization.py @@ -1,7 +1,7 @@ from typing import List -from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence -from tts.text.pipeline_components.phonetization.base_phonetization import BasePhonetization -from tts.text.pipeline_components.phonetization.cmudict import CMUDict +from text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence +from text.pipeline_components.phonetization.base_phonetization import BasePhonetization +from text.pipeline_components.phonetization.cmudict import CMUDict class EnglishPhonetization(BasePhonetization): diff --git a/tts/text/pipeline_components/phonetization/test_cmudict.py b/tts/text/pipeline_components/phonetization/test_cmudict.py index bd7963d..ce75a65 100644 --- a/tts/text/pipeline_components/phonetization/test_cmudict.py +++ b/tts/text/pipeline_components/phonetization/test_cmudict.py @@ -1,5 +1,5 @@ -from tts.text.pipeline_components.phonetization.cmudict import CMUDict -from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH +from text.pipeline_components.phonetization.cmudict import CMUDict +from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH class TestCmuDict: diff --git a/tts/text/pipeline_components/phonetization/test_english_phonetization.py b/tts/text/pipeline_components/phonetization/test_english_phonetization.py index 8918aaf..c5a2926 100644 --- a/tts/text/pipeline_components/phonetization/test_english_phonetization.py +++ b/tts/text/pipeline_components/phonetization/test_english_phonetization.py @@ -1,7 +1,7 @@ -from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict -from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization -from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence -from tts.text.pipeline_components.input_parsing.parser import GraphemeSequence +from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict +from text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization +from text.pipeline_components.input_parsing.parser import ArpabetSequence +from text.pipeline_components.input_parsing.parser import GraphemeSequence class TestEnglishPhonetization: diff --git a/tts/text/pipeline_components/sequencing/english_symbols_v1.py b/tts/text/pipeline_components/sequencing/english_symbols_v1.py index c947a19..f013947 100644 --- a/tts/text/pipeline_components/sequencing/english_symbols_v1.py +++ b/tts/text/pipeline_components/sequencing/english_symbols_v1.py @@ -13,7 +13,7 @@ Original documentation: _characters. See TRAINING_DATA.md for details. """ -from tts.text.pipeline_components.phonetization import cmudict +from text.pipeline_components.phonetization import cmudict from typing import List # NB: DO NOT CHANGE THE ORDER OF SYMBOLS! diff --git a/tts/text/pipeline_components/sequencing/test_english_symbols_v1.py b/tts/text/pipeline_components/sequencing/test_english_symbols_v1.py index b592432..edf1799 100644 --- a/tts/text/pipeline_components/sequencing/test_english_symbols_v1.py +++ b/tts/text/pipeline_components/sequencing/test_english_symbols_v1.py @@ -1,4 +1,4 @@ -from tts.text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence +from text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence class TestEnglishSymbols: diff --git a/tts/vocodes_common.py b/tts/vocodes_common.py index 740855a..1753577 100644 --- a/tts/vocodes_common.py +++ b/tts/vocodes_common.py @@ -1,9 +1,5 @@ import sys -from tts.text.pipeline.english_pipeline_v1 import EnglishPipelineV1 -from tts.text.pipeline.legacy_fakeyou_pipeline import LegacyFakeYouPipeline -from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH -from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization sys.path.append('waveglow/') import shutil import json @@ -34,6 +30,11 @@ import subprocess import magic import os +from text.pipeline.english_pipeline_v1 import EnglishPipelineV1 +from text.pipeline.legacy_fakeyou_pipeline import LegacyFakeYouPipeline +from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH +from text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization + def print_gpu_info(): print('========================================') print('Python interpreter', sys.executable)