simplify requirements.txt

requirements/extra-PHAL.txt

@@ -1,2 +1 @@
-ovos_PHAL~=0.0, >=0.0.2
-ovos-phal-plugin-connectivity-events~=0.0, >=0.0.1
+ovos_PHAL~=0.0, >=0.0.2

requirements/extra-audiobackend.txt

@@ -1,6 +1,2 @@
-ovos_plugin_common_play~=0.0.3
-ovos-ocp-youtube-plugin~=0.0.1
-ovos-ocp-m3u-plugin~=0.0.1
-ovos-ocp-rss-plugin~=0.0.2
-ovos-ocp-files-plugin~=0.13
-ovos-ocp-news-plugin~=0.0.3
+# audio service
+ovos-audio

requirements/extra-bus.txt

@@ -1 +1,2 @@
-tornado~=6.0, >=6.0.3
+# messagebus service
+ovos-messagebus

requirements/extra-deprecated.txt

@@ -1,3 +1,5 @@
+# only required if importing from mycroft.deprecated module
+# not used internally
 msm
 mock_msm~=0.9
 ovos_cli_client

requirements/extra-gui.txt

@@ -1 +1,2 @@
-tornado~=6.0, >=6.0.3
+# gui service
+ovos-gui

requirements/extra-lgpl.txt

@@ -0,0 +1,3 @@
+# LGPL dependencies (optional)
+padatious~=0.4.8
+fann2==1.0.7

requirements/extra-mark1.txt

@@ -1,3 +1,4 @@
+# todo - replace with mk1 PHAL plugin dependency
 pyalsaaudio~=0.8
 pyserial~=3.0
 pillow~=8.3

requirements/extra-stt.txt

@@ -1,9 +1,9 @@
-SpeechRecognition~=3.8
-PyAudio~=0.2
+# speech client + stt plugins
+ovos-listener
 
 ovos-vad-plugin-webrtcvad~=0.0.1
-
 ovos-ww-plugin-pocketsphinx~=0.1, >=0.1.3
+# TODO - remove precise
 ovos-ww-plugin-precise~=0.1
 ovos-ww-plugin-precise-lite~=0.1, >=0.1.1
 ovos-ww-plugin-vosk~=0.1, >=0.1.1

requirements/extra-tts.txt

@@ -1,3 +1,4 @@
+# extra plugins for TTS
 ovos-tts-plugin-mimic~=0.2, >=0.2.6
 ovos-tts-plugin-mimic2~=0.1, >=0.1.5
 ovos-tts-plugin-mimic3-server~=0.0

requirements/minimal.txt

@@ -11,4 +11,10 @@ ovos-plugin-manager~=0.0, >=0.0.22
 ovos-config~=0.0,>=0.0.5
 ovos-lingua-franca~=0.4, >=0.4.6
 ovos_backend_client~=0.0, >=0.0.5
-ovos_workshop~=0.0, >=0.0.11
+ovos_workshop~=0.0, >=0.0.11
+
+adapt-parser~=0.5
+padacioso~=0.1.2
+ovos-lingua-franca>=0.4.6
+PyYAML~=5.4
+ovos-phal-plugin-connectivity-events~=0.0, >=0.0.1

requirements/requirements.txt

@@ -1,49 +1,33 @@
+# misc
 requests~=2.26
-PyAudio~=0.2
-SpeechRecognition~=3.8
-tornado~=6.0, >=6.0.3
-psutil~=5.6.6
-python-dateutil~=2.6
 combo-lock~=0.2
 PyYAML~=5.4
+python-dateutil~=2.6
 watchdog~=2.1
 
-mycroft-messagebus-client~=0.9,!=0.9.2,!=0.9.3
+# skills service requirements
 adapt-parser~=0.5
-padatious~=0.4.8
 padacioso~=0.1.2
-fann2==1.0.7
-padaos~=0.1
-
-ovos_backend_client~=0.0, >=0.0.5
+ovos-utils~=0.0, >=0.0.29
+ovos-plugin-manager~=0.0, >=0.0.20
 ovos-config~=0.0,>=0.0.5
-ovos-utils~=0.0, >=0.0.31a1
-ovos-plugin-manager~=0.0, >=0.0.22
+ovos-lingua-franca~=0.4, >=0.4.6
+ovos_backend_client~=0.0, >=0.0.5
 ovos_workshop~=0.0, >=0.0.11
-ovos_PHAL~=0.0, >=0.0.2
-ovos-lingua-franca>=0.4.6
 
-ovos-stt-plugin-server~=0.0, >=0.0.2
-ovos-tts-plugin-mimic~=0.2, >=0.2.6
-ovos-tts-plugin-mimic3-server~=0.0
+# services
+ovos-listener
+ovos-audio
+ovos-messagebus
+ovos-gui
 
-ovos-ww-plugin-pocketsphinx~=0.1
-ovos-ww-plugin-precise~=0.1
-ovos-vad-plugin-webrtcvad~=0.0.1
-
-ovos_plugin_common_play~=0.0.3
-# ovos-ocp-youtube-plugin
-ovos-ocp-m3u-plugin~=0.0.1
-ovos-ocp-rss-plugin~=0.0.2
-ovos-ocp-files-plugin~=0.13
-ovos-ocp-news-plugin~=0.0.3
-
-ovos-skill-volume~=0.0.1
+# default skills
 ovos-skill-fallback-unknown~=0.0.2
 ovos-skill-stop~=0.2
+ovos-skill-volume~=0.0.1
 # neon-skill-alerts~=1.2
 ovos-skill-personal~=0.0, >=0.0.3
 ovos-skill-naptime~=0.2, >=0.2.2
 ovos-skill-date-time~=0.2, >=0.2.2
 ovos-skill-hello-world~=0.0, >=0.0.3
-ovos-skill-filebrowser~=0.0, >=0.0.2
+ovos-skill-filebrowser~=0.0, >=0.0.2

setup.py

@@ -67,8 +67,7 @@ def required(requirements_file):
         'PHAL': required('requirements/extra-PHAL.txt'),
         'stt': required('requirements/extra-stt.txt'),
         'tts': required('requirements/extra-tts.txt'),
-        "skills_lgpl": required('requirements/extra-skills-lgpl.txt'),
-        'skills': required('requirements/extra-skills.txt'),
+        "lgpl": required('requirements/extra-lgpl.txt'),
         'gui': required('requirements/extra-gui.txt'),
         'bus': required('requirements/extra-bus.txt'),
         'deprecated': required('requirements/extra-deprecated.txt'),