From 0e4fbd066fd76cbda880dab7f18de705c957ec60 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 25 Mar 2020 16:05:09 -0400 Subject: [PATCH] Upgrade to Python 3.7 --- .python-version | 1 + bin/rhasspy-voltron | 2 +- requirements.txt | 10 ++++------ requirements_dev.txt | 9 ++++----- rhasspy-asr | 2 +- rhasspy-asr-kaldi | 2 +- rhasspy-asr-kaldi-hermes | 2 +- rhasspy-asr-pocketsphinx | 2 +- rhasspy-asr-pocketsphinx-hermes | 2 +- rhasspy-dialogue-hermes | 2 +- rhasspy-fuzzywuzzy | 2 +- rhasspy-fuzzywuzzy-hermes | 2 +- rhasspy-hermes | 2 +- rhasspy-homeassistant-hermes | 2 +- rhasspy-microphone-cli-hermes | 2 +- rhasspy-microphone-pyaudio-hermes | 2 +- rhasspy-nlu | 2 +- rhasspy-nlu-hermes | 2 +- rhasspy-profile | 2 +- rhasspy-rasa-nlu-hermes | 2 +- rhasspy-remote-http-hermes | 2 +- rhasspy-server-hermes | 2 +- rhasspy-silence | 2 +- rhasspy-speakers-cli-hermes | 2 +- rhasspy-supervisor | 2 +- rhasspy-tts-cli-hermes | 2 +- rhasspy-wake-pocketsphinx-hermes | 2 +- rhasspy-wake-porcupine-hermes | 2 +- rhasspy-wake-precise-hermes | 2 +- rhasspy-wake-snowboy-hermes | 2 +- 30 files changed, 36 insertions(+), 38 deletions(-) create mode 100644 .python-version diff --git a/.python-version b/.python-version new file mode 100644 index 0000000..d2577d9 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.7.7 diff --git a/bin/rhasspy-voltron b/bin/rhasspy-voltron index bd8243b..b3ae7b9 100755 --- a/bin/rhasspy-voltron +++ b/bin/rhasspy-voltron @@ -111,7 +111,7 @@ function finish { kill "${web_pid}" } -trap finish EXIT +# trap finish EXIT # Run assistant log_path="${profile_dir}/supervisord.log" diff --git a/requirements.txt b/requirements.txt index 3ef0abf..8ff10f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,7 @@ aiofiles==0.4.0 aiohttp==3.6.2 -attrs==19.3.0 -json5==0.7.0 +json5==0.9.3 mkdocs >= 1.0.4 -multidict==4.6.1 networkx==2.4 num2words==0.5.10 paho-mqtt==1.5.0 @@ -12,8 +10,8 @@ precise-runner==0.3.1 PyAudio==0.2.11 pydash==4.7.6 pyyaml==5.3 -quart==0.6.15 -quart-cors==0.1.3 +quart==0.11.3 +quart-cors==0.3.0 rapidfuzz==0.2.1 -swagger-ui-py==0.1.7 +swagger-ui-py==0.2.1 webrtcvad==2.0.10 diff --git a/requirements_dev.txt b/requirements_dev.txt index 17cb377..bfa0399 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,10 +1,9 @@ black==19.10b0 -coverage==5.0.2 +coverage==5.0.4 flake8==3.7.9 -mypy==0.761 +mypy==0.770 pyinstaller==3.6 pylint==2.4.4 -pytest==5.3.5 +pytest==5.4.1 pytest-cov==2.8.1 -yamllint==1.20.0 -mkdocs==1.0.4 +yamllint==1.21.0 diff --git a/rhasspy-asr b/rhasspy-asr index 3902c67..bd59327 160000 --- a/rhasspy-asr +++ b/rhasspy-asr @@ -1 +1 @@ -Subproject commit 3902c6744e94e93526c5ae4f2d7ebbe017611f32 +Subproject commit bd59327284a9ca31f73d82239f03b15c74cff369 diff --git a/rhasspy-asr-kaldi b/rhasspy-asr-kaldi index 2951562..939a911 160000 --- a/rhasspy-asr-kaldi +++ b/rhasspy-asr-kaldi @@ -1 +1 @@ -Subproject commit 29515621be13c7ecb45ce3a787a241f49a574d60 +Subproject commit 939a9111293ba981b41d3d75928a8d89f5071831 diff --git a/rhasspy-asr-kaldi-hermes b/rhasspy-asr-kaldi-hermes index e6fecfd..31859af 160000 --- a/rhasspy-asr-kaldi-hermes +++ b/rhasspy-asr-kaldi-hermes @@ -1 +1 @@ -Subproject commit e6fecfd202757d49e25fe13c2e3cffba72ce8320 +Subproject commit 31859af5156d82aaddc85c22cc1e5155b1884f0b diff --git a/rhasspy-asr-pocketsphinx b/rhasspy-asr-pocketsphinx index 22ecfd1..14b5e52 160000 --- a/rhasspy-asr-pocketsphinx +++ b/rhasspy-asr-pocketsphinx @@ -1 +1 @@ -Subproject commit 22ecfd17250bcfa3950ce518b06550ec7bb7f9a6 +Subproject commit 14b5e526f2b55a1776bb51ad67bc2c77b4b745a5 diff --git a/rhasspy-asr-pocketsphinx-hermes b/rhasspy-asr-pocketsphinx-hermes index e181d25..3b64400 160000 --- a/rhasspy-asr-pocketsphinx-hermes +++ b/rhasspy-asr-pocketsphinx-hermes @@ -1 +1 @@ -Subproject commit e181d250350e6b2492e27230976b7fa7111ba0db +Subproject commit 3b644003ecb5ff744d5831e1ae55554cc00eac81 diff --git a/rhasspy-dialogue-hermes b/rhasspy-dialogue-hermes index 8414300..e6701f4 160000 --- a/rhasspy-dialogue-hermes +++ b/rhasspy-dialogue-hermes @@ -1 +1 @@ -Subproject commit 84143002a6d54e29367f4d5735a56ecf6a92b7bb +Subproject commit e6701f4651c03ae32e90f01617c18fcdc82da8d6 diff --git a/rhasspy-fuzzywuzzy b/rhasspy-fuzzywuzzy index 292c71f..956b9ea 160000 --- a/rhasspy-fuzzywuzzy +++ b/rhasspy-fuzzywuzzy @@ -1 +1 @@ -Subproject commit 292c71f742aca96dbe0f93124c79b288116c64dd +Subproject commit 956b9eaf9a364ea153fff53b3e3adf0c889edeef diff --git a/rhasspy-fuzzywuzzy-hermes b/rhasspy-fuzzywuzzy-hermes index 869efc4..bbc8209 160000 --- a/rhasspy-fuzzywuzzy-hermes +++ b/rhasspy-fuzzywuzzy-hermes @@ -1 +1 @@ -Subproject commit 869efc4e044b96c4b81bce4cc8fee91a7332ec2b +Subproject commit bbc8209b51a81e0ec74c288cf6ad8d1e27a42c53 diff --git a/rhasspy-hermes b/rhasspy-hermes index 3756aa4..aea7195 160000 --- a/rhasspy-hermes +++ b/rhasspy-hermes @@ -1 +1 @@ -Subproject commit 3756aa435391cf04384bf26c1aee9e2eae0c00db +Subproject commit aea71952ac9420facaa48368960ea3f89465f55d diff --git a/rhasspy-homeassistant-hermes b/rhasspy-homeassistant-hermes index c956b5a..3e6deaf 160000 --- a/rhasspy-homeassistant-hermes +++ b/rhasspy-homeassistant-hermes @@ -1 +1 @@ -Subproject commit c956b5a7d862cb6cf290559bf6be613073cbb077 +Subproject commit 3e6deafde5a02d573382be18889f785a096820d3 diff --git a/rhasspy-microphone-cli-hermes b/rhasspy-microphone-cli-hermes index e1e6a96..2fabc2c 160000 --- a/rhasspy-microphone-cli-hermes +++ b/rhasspy-microphone-cli-hermes @@ -1 +1 @@ -Subproject commit e1e6a9608660d7af7e3586194f8b485fc95ffe73 +Subproject commit 2fabc2c6775b7b8dda0ec6e5355067938e726b03 diff --git a/rhasspy-microphone-pyaudio-hermes b/rhasspy-microphone-pyaudio-hermes index 179259d..ccff56d 160000 --- a/rhasspy-microphone-pyaudio-hermes +++ b/rhasspy-microphone-pyaudio-hermes @@ -1 +1 @@ -Subproject commit 179259d2437b2d56bb57b31e6ed14792bb697c7c +Subproject commit ccff56db6bbd85f3273ca292309877856c95d50d diff --git a/rhasspy-nlu b/rhasspy-nlu index 9426cdf..215cff1 160000 --- a/rhasspy-nlu +++ b/rhasspy-nlu @@ -1 +1 @@ -Subproject commit 9426cdf0b57414efb4d7bb58704c69705dc5bb00 +Subproject commit 215cff1f8a93d5467a368d186e3391e6732d57f9 diff --git a/rhasspy-nlu-hermes b/rhasspy-nlu-hermes index 35dc080..774bc1a 160000 --- a/rhasspy-nlu-hermes +++ b/rhasspy-nlu-hermes @@ -1 +1 @@ -Subproject commit 35dc0803e10f8ae716e35d33706922948628995c +Subproject commit 774bc1ad1c9557e8251cbcd0d398d99e7a585526 diff --git a/rhasspy-profile b/rhasspy-profile index e454fd6..a0786e3 160000 --- a/rhasspy-profile +++ b/rhasspy-profile @@ -1 +1 @@ -Subproject commit e454fd6a18be26e3afd06a245d904c1ea28ac9d6 +Subproject commit a0786e32c915d29b7e78106e3c6a39f58f8b8d3f diff --git a/rhasspy-rasa-nlu-hermes b/rhasspy-rasa-nlu-hermes index 1977647..e580d37 160000 --- a/rhasspy-rasa-nlu-hermes +++ b/rhasspy-rasa-nlu-hermes @@ -1 +1 @@ -Subproject commit 19776478cd819b7c251caf2605341afc85081c78 +Subproject commit e580d3733ce342cd3c5b87d9141a7bf481ab5324 diff --git a/rhasspy-remote-http-hermes b/rhasspy-remote-http-hermes index aaa1e4e..35ce807 160000 --- a/rhasspy-remote-http-hermes +++ b/rhasspy-remote-http-hermes @@ -1 +1 @@ -Subproject commit aaa1e4e67e36d786afd27782b3fd77b3ef3b70a9 +Subproject commit 35ce807e72755d17b9ebfe88d892a1d3adbd681c diff --git a/rhasspy-server-hermes b/rhasspy-server-hermes index 03aff0f..a0a0b00 160000 --- a/rhasspy-server-hermes +++ b/rhasspy-server-hermes @@ -1 +1 @@ -Subproject commit 03aff0f01ba0b0ceca97b9fac9259d0ebcc1973e +Subproject commit a0a0b00bdf942f35e989514e729ecd8c03be9a3e diff --git a/rhasspy-silence b/rhasspy-silence index c12520e..151dd96 160000 --- a/rhasspy-silence +++ b/rhasspy-silence @@ -1 +1 @@ -Subproject commit c12520e808152b7310dbc317390f5f67a3d8becb +Subproject commit 151dd9605e5ba7ce18725132af798d3184d1fdff diff --git a/rhasspy-speakers-cli-hermes b/rhasspy-speakers-cli-hermes index 0839920..28e4cc5 160000 --- a/rhasspy-speakers-cli-hermes +++ b/rhasspy-speakers-cli-hermes @@ -1 +1 @@ -Subproject commit 083992070709c3cf016a424fef516ee53ee89f2d +Subproject commit 28e4cc58cb71060b4f7f2f39a7352a19aa2a76dc diff --git a/rhasspy-supervisor b/rhasspy-supervisor index 3e7dfa1..5786ebc 160000 --- a/rhasspy-supervisor +++ b/rhasspy-supervisor @@ -1 +1 @@ -Subproject commit 3e7dfa17eb0f6adabf14d2983ca060039ffab2a9 +Subproject commit 5786ebc2966b8d04e96f0dc6203dfaf16f9aaa91 diff --git a/rhasspy-tts-cli-hermes b/rhasspy-tts-cli-hermes index c4e2262..8dbe2a1 160000 --- a/rhasspy-tts-cli-hermes +++ b/rhasspy-tts-cli-hermes @@ -1 +1 @@ -Subproject commit c4e22626b05010e7eef387d90ddc73ad7179bed6 +Subproject commit 8dbe2a1c3be546202c81b58ffb3f63021ebda7d9 diff --git a/rhasspy-wake-pocketsphinx-hermes b/rhasspy-wake-pocketsphinx-hermes index ed6976a..8319169 160000 --- a/rhasspy-wake-pocketsphinx-hermes +++ b/rhasspy-wake-pocketsphinx-hermes @@ -1 +1 @@ -Subproject commit ed6976acc3455521775612792095bcf3c3c6f272 +Subproject commit 831916901825a0e657f9b4ebde5cf83c74a5f98c diff --git a/rhasspy-wake-porcupine-hermes b/rhasspy-wake-porcupine-hermes index e98fbd4..ae71557 160000 --- a/rhasspy-wake-porcupine-hermes +++ b/rhasspy-wake-porcupine-hermes @@ -1 +1 @@ -Subproject commit e98fbd4e2f7299fb3d2545b7b889fb464a45acd1 +Subproject commit ae715577b5ddf5db74dce268339a59993fbd006d diff --git a/rhasspy-wake-precise-hermes b/rhasspy-wake-precise-hermes index 405df4b..7f553b9 160000 --- a/rhasspy-wake-precise-hermes +++ b/rhasspy-wake-precise-hermes @@ -1 +1 @@ -Subproject commit 405df4b68d870bf5bbb4583f5eb6b9268ecd1163 +Subproject commit 7f553b93cb931f2adb7105ad81e4d0468ffe61ee diff --git a/rhasspy-wake-snowboy-hermes b/rhasspy-wake-snowboy-hermes index a000158..b570e06 160000 --- a/rhasspy-wake-snowboy-hermes +++ b/rhasspy-wake-snowboy-hermes @@ -1 +1 @@ -Subproject commit a0001580773ae3722acbc6551dedafc22021b212 +Subproject commit b570e060ae74d10f7699cfec8936bd886dad536a