diff --git a/homeassistant/components/tts/amazon_polly.py b/homeassistant/components/amazon_polly/tts.py similarity index 100% rename from homeassistant/components/tts/amazon_polly.py rename to homeassistant/components/amazon_polly/tts.py diff --git a/homeassistant/components/tts/baidu.py b/homeassistant/components/baidu/tts.py similarity index 100% rename from homeassistant/components/tts/baidu.py rename to homeassistant/components/baidu/tts.py diff --git a/homeassistant/components/demo/mailbox.py b/homeassistant/components/demo/mailbox.py index 885988adb6b..fcffc44eefb 100644 --- a/homeassistant/components/demo/mailbox.py +++ b/homeassistant/components/demo/mailbox.py @@ -63,7 +63,7 @@ class DemoMailbox(Mailbox): raise StreamError("Message not found") audio_path = os.path.join( - os.path.dirname(__file__), '..', 'tts', 'demo.mp3') + os.path.dirname(__file__), 'tts.mp3') with open(audio_path, 'rb') as file: return file.read() diff --git a/homeassistant/components/tts/demo.mp3 b/homeassistant/components/demo/tts.mp3 similarity index 100% rename from homeassistant/components/tts/demo.mp3 rename to homeassistant/components/demo/tts.mp3 diff --git a/homeassistant/components/tts/demo.py b/homeassistant/components/demo/tts.py similarity index 90% rename from homeassistant/components/tts/demo.py rename to homeassistant/components/demo/tts.py index 6784e7cea61..1498472ef9f 100644 --- a/homeassistant/components/tts/demo.py +++ b/homeassistant/components/demo/tts.py @@ -8,7 +8,7 @@ import os import voluptuous as vol -from . import CONF_LANG, PLATFORM_SCHEMA, Provider +from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider SUPPORT_LANGUAGES = [ 'en', 'de' @@ -51,7 +51,7 @@ class DemoProvider(Provider): def get_tts_audio(self, message, language, options=None): """Load TTS from demo.""" - filename = os.path.join(os.path.dirname(__file__), 'demo.mp3') + filename = os.path.join(os.path.dirname(__file__), 'tts.mp3') try: with open(filename, 'rb') as voice: data = voice.read() diff --git a/homeassistant/components/tts/marytts.py b/homeassistant/components/marytts/tts.py similarity index 97% rename from homeassistant/components/tts/marytts.py rename to homeassistant/components/marytts/tts.py index 971d3fb5705..8f6a46b0c3e 100644 --- a/homeassistant/components/tts/marytts.py +++ b/homeassistant/components/marytts/tts.py @@ -16,7 +16,7 @@ from homeassistant.const import CONF_HOST, CONF_PORT from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv -from . import CONF_LANG, PLATFORM_SCHEMA, Provider +from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tts/microsoft.py b/homeassistant/components/microsoft/tts.py similarity index 100% rename from homeassistant/components/tts/microsoft.py rename to homeassistant/components/microsoft/tts.py diff --git a/homeassistant/components/tts/picotts.py b/homeassistant/components/picotts/tts.py similarity index 100% rename from homeassistant/components/tts/picotts.py rename to homeassistant/components/picotts/tts.py diff --git a/homeassistant/components/tts/voicerss.py b/homeassistant/components/voicerss/tts.py similarity index 98% rename from homeassistant/components/tts/voicerss.py rename to homeassistant/components/voicerss/tts.py index 3676dff3bc6..20e0ee11db3 100644 --- a/homeassistant/components/tts/voicerss.py +++ b/homeassistant/components/voicerss/tts.py @@ -15,7 +15,7 @@ from homeassistant.const import CONF_API_KEY from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv -from . import CONF_LANG, PLATFORM_SCHEMA, Provider +from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tts/yandextts.py b/homeassistant/components/yandextts/tts.py similarity index 98% rename from homeassistant/components/tts/yandextts.py rename to homeassistant/components/yandextts/tts.py index aecba2925dd..281839a2d74 100644 --- a/homeassistant/components/tts/yandextts.py +++ b/homeassistant/components/yandextts/tts.py @@ -15,7 +15,7 @@ from homeassistant.const import CONF_API_KEY from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv -from . import CONF_LANG, PLATFORM_SCHEMA, Provider +from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider _LOGGER = logging.getLogger(__name__) diff --git a/requirements_all.txt b/requirements_all.txt index 8ad56528f4f..f726f57471b 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -191,9 +191,6 @@ av==6.1.2 # homeassistant.components.axis axis==17 -# homeassistant.components.tts.baidu -baidu-aip==1.6.6 - # homeassistant.components.modem_callerid.sensor basicmodem==0.7 @@ -236,7 +233,6 @@ blockchain==1.4.4 # homeassistant.components.notify.aws_lambda # homeassistant.components.notify.aws_sns # homeassistant.components.notify.aws_sqs -# homeassistant.components.tts.amazon_polly boto3==1.9.16 # homeassistant.scripts.credstash @@ -991,9 +987,6 @@ pycomfoconnect==0.3 # homeassistant.components.coolmaster.climate pycoolmasternet==0.0.4 -# homeassistant.components.tts.microsoft -pycsspeechtts==1.0.2 - # homeassistant.components.cups.sensor # pycups==1.9.73 diff --git a/tests/components/marytts/__init__.py b/tests/components/marytts/__init__.py new file mode 100644 index 00000000000..061776a1398 --- /dev/null +++ b/tests/components/marytts/__init__.py @@ -0,0 +1 @@ +"""The tests for marytts tts platforms.""" diff --git a/tests/components/tts/test_marytts.py b/tests/components/marytts/test_tts.py similarity index 98% rename from tests/components/tts/test_marytts.py rename to tests/components/marytts/test_tts.py index 7520ba2fbaa..24915dd85c8 100644 --- a/tests/components/tts/test_marytts.py +++ b/tests/components/marytts/test_tts.py @@ -11,7 +11,7 @@ from homeassistant.components.media_player.const import ( from tests.common import ( get_test_home_assistant, assert_setup_component, mock_service) -from .test_init import mutagen_mock # noqa +from tests.components.tts.test_init import mutagen_mock # noqa class TestTTSMaryTTSPlatform: diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py index 4786370f24f..140a938201b 100644 --- a/tests/components/tts/test_init.py +++ b/tests/components/tts/test_init.py @@ -9,7 +9,7 @@ import requests import homeassistant.components.http as http import homeassistant.components.tts as tts -from homeassistant.components.tts.demo import DemoProvider +from homeassistant.components.demo.tts import DemoProvider from homeassistant.components.media_player.const import ( SERVICE_PLAY_MEDIA, MEDIA_TYPE_MUSIC, ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_CONTENT_TYPE, DOMAIN as DOMAIN_MP) @@ -229,7 +229,7 @@ class TestTTS: "265944c108cbb00b2a621be5930513e03a0bb2cd_de_{0}_demo.mp3".format( opt_hash))) - @patch('homeassistant.components.tts.demo.DemoProvider.default_options', + @patch('homeassistant.components.demo.tts.DemoProvider.default_options', new_callable=PropertyMock(return_value={'voice': 'alex'})) def test_setup_component_and_test_with_service_options_def(self, def_mock): """Set up the demo platform and call service with default options.""" @@ -519,7 +519,7 @@ class TestTTS: with assert_setup_component(1, tts.DOMAIN): setup_component(self.hass, tts.DOMAIN, config) - with patch('homeassistant.components.tts.demo.DemoProvider.' + with patch('homeassistant.components.demo.tts.DemoProvider.' 'get_tts_audio', return_value=(None, None)): self.hass.services.call(tts.DOMAIN, 'demo_say', { tts.ATTR_MESSAGE: "I person is on front of your door.", @@ -531,7 +531,7 @@ class TestTTS: "{}/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd" \ "_en_-_demo.mp3".format(self.hass.config.api.base_url) - @patch('homeassistant.components.tts.demo.DemoProvider.get_tts_audio', + @patch('homeassistant.components.demo.tts.DemoProvider.get_tts_audio', return_value=(None, None)) def test_setup_component_test_with_error_on_get_tts(self, tts_mock): """Set up demo platform with wrong get_tts_audio.""" diff --git a/tests/components/voicerss/__init__.py b/tests/components/voicerss/__init__.py new file mode 100644 index 00000000000..9c037a14465 --- /dev/null +++ b/tests/components/voicerss/__init__.py @@ -0,0 +1 @@ +"""The tests for VoiceRSS tts platforms.""" diff --git a/tests/components/tts/test_voicerss.py b/tests/components/voicerss/test_tts.py similarity index 99% rename from tests/components/tts/test_voicerss.py rename to tests/components/voicerss/test_tts.py index af4bdf3976c..cd0e20cb9fa 100644 --- a/tests/components/tts/test_voicerss.py +++ b/tests/components/voicerss/test_tts.py @@ -11,7 +11,7 @@ from homeassistant.setup import setup_component from tests.common import ( get_test_home_assistant, assert_setup_component, mock_service) -from .test_init import mutagen_mock # noqa +from tests.components.tts.test_init import mutagen_mock # noqa class TestTTSVoiceRSSPlatform: diff --git a/tests/components/yandextts/__init__.py b/tests/components/yandextts/__init__.py new file mode 100644 index 00000000000..54968b3605f --- /dev/null +++ b/tests/components/yandextts/__init__.py @@ -0,0 +1 @@ +"""The tests for YandexTTS tts platforms.""" diff --git a/tests/components/tts/test_yandextts.py b/tests/components/yandextts/test_tts.py similarity index 99% rename from tests/components/tts/test_yandextts.py rename to tests/components/yandextts/test_tts.py index 70c75b1f2ed..dd382271338 100644 --- a/tests/components/tts/test_yandextts.py +++ b/tests/components/yandextts/test_tts.py @@ -10,7 +10,7 @@ from homeassistant.components.media_player.const import ( from tests.common import ( get_test_home_assistant, assert_setup_component, mock_service) -from .test_init import mutagen_mock # noqa +from tests.components.tts.test_init import mutagen_mock # noqa class TestTTSYandexPlatform: