Merge pull request #177 from OpenVoiceOS/fix/requirements

[ansible/template] Fix requirements

ansible/roles/ovos_installer/templates/virtualenv/core-requirements.txt.j2

@@ -1,15 +1,15 @@
-ovos-messagebus
+ovos-audio[extras]
 ovos-core[lgpl,plugins]
-ovos-PHAL[extras,linux]
 ovos-dinkum-listener[extras,linux]
-ovos-audio[extras]
+ovos-messagebus
+ovos-PHAL[linux]
+ovos-phal-plugin-ipgeo
+ovos-tts-plugin-polly
 
 {% if (ansible_architecture == "x86_64") or (ansible_architecture == "aarch64") %}
 ovos-audio-transformer-plugin-ggwave
 {% endif %}
 
-ovos-tts-plugin-polly
-
 {% if ovos_installer_cpu_is_capable | bool %}
 ovos-dinkum-listener[onnx]
 {% endif %}
@@ -29,10 +29,3 @@ git+https://github.com/OVOSHatchery/ovos-PHAL-plugin-sj201-leds.git
 
 # No PyPi release
 git+https://github.com/OpenVoiceOS/ovos-cli-client.git
-
-# Non-OVOS libraries
-#neon-mana-utils #Commented until PyYAML requirement is fixed
-{% if (ansible_architecture == "x86_64") or (ansible_architecture == "aarch64") %}
-onnxruntime
-vosk
-{% endif %}

ansible/roles/ovos_installer/templates/virtualenv/satellite-requirements.txt.j2

@@ -1,9 +1,9 @@
 ovos-audio[extras]
-ovos-dinkum-listener[extras,linux]
-ovos-PHAL[extras,linux]
 ovos-backend-client
 ovos-classifiers
-
+ovos-dinkum-listener[extras,linux]
+ovos-PHAL[linux]
+ovos-phal-plugin-ipgeo
 ovos-tts-plugin-polly
 
 {% if ovos_installer_cpu_is_capable | bool %}
@@ -21,4 +21,3 @@ ovos-PHAL[mk2]
 # No PyPi release
 git+https://github.com/JarbasHiveMind/HiveMind-voice-sat.git
 git+https://github.com/JarbasHiveMind/hivemind_websocket_client.git
-

ansible/roles/ovos_installer/templates/virtualenv/skills-requirements.txt.j2

@@ -8,4 +8,3 @@ ovos-core[skills-audio]
 {% if (ansible_architecture == "x86_64") or (ansible_architecture == "aarch64") or (ovos_installer_profile != "server") %}
 git+https://github.com/OpenVoiceOS/ovos-skill-ggwave.git
 {% endif %}
-