Cleanup unrelated changes

NeonGeckoCom · Jan 25, 2022 · 1e8ae9d · 1e8ae9d
1 parent d71be74
commit 1e8ae9d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 32 deletions.
diff --git a/neon_core/run_neon.py b/neon_core/run_neon.py
@@ -159,7 +159,7 @@ def start_neon():
     bus.connected_event.wait()
     _start_process("neon_speech_client") or STOP_MODULES.set()
     _start_process("neon_audio_client") or STOP_MODULES.set()
-    # _start_process(["python3", "-m", "neon_core.skills"]) or STOP_MODULES.set()
+    _start_process(["python3", "-m", "neon_core.skills"]) or STOP_MODULES.set()
     _start_process("neon_transcripts_controller")
     if get_neon_device_type() == "server":
         _start_process("neon_core_server")

diff --git a/neon_core/skills/__init__.py b/neon_core/skills/__init__.py
@@ -23,25 +23,21 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-try:
-    from neon_utils.skills.mycroft_skill import PatchedMycroftSkill
-    from neon_core.skills.neon_skill import NeonSkill
-    from neon_core.skills.fallback_skill import NeonFallbackSkill
-    from neon_core.skills.decorators import intent_handler, intent_file_handler, \
-        resting_screen_handler, conversational_intent
+from neon_utils.skills.mycroft_skill import PatchedMycroftSkill
+from neon_core.skills.neon_skill import NeonSkill
+from neon_core.skills.fallback_skill import NeonFallbackSkill
+from neon_core.skills.decorators import intent_handler, intent_file_handler, \
+    resting_screen_handler, conversational_intent
 
-    import mycroft.skills.core
-    mycroft.MycroftSkill = PatchedMycroftSkill
-    mycroft.skills.MycroftSkill = PatchedMycroftSkill
-    mycroft.skills.core.MycroftSkill = PatchedMycroftSkill
-    mycroft.skills.mycroft_skill.MycroftSkill = PatchedMycroftSkill
+import mycroft.skills.core
+mycroft.MycroftSkill = PatchedMycroftSkill
+mycroft.skills.MycroftSkill = PatchedMycroftSkill
+mycroft.skills.core.MycroftSkill = PatchedMycroftSkill
+mycroft.skills.mycroft_skill.MycroftSkill = PatchedMycroftSkill
 
-    __all__ = ['NeonSkill',
-               'intent_handler',
-               'intent_file_handler',
-               'resting_screen_handler',
-               'conversational_intent',
-               'NeonFallbackSkill']
-except ModuleNotFoundError:
-    from neon_utils.logger import LOG
-    LOG.error("Could not init skills module")
+__all__ = ['NeonSkill',
+           'intent_handler',
+           'intent_file_handler',
+           'resting_screen_handler',
+           'conversational_intent',
+           'NeonFallbackSkill']
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,15 +1,14 @@
 # mycroft
 # TODO: Reduce ovos-core installed deps here
 ovos-core[skills]==0.0.1
-lingua-franca~=0.4.2
 mock_msm
 
 # neon core modules
-neon_messagebus
+# neon_messagebus
 # neon_speech~=0.3
 # neon_audio~=0.4
 # neon_enclosure~=0.1,>=0.1.2
-neon_gui
+# neon_gui
 # TODO: Version spec GUI
 
 # utils

diff --git a/requirements/server.txt b/requirements/server.txt
@@ -1,9 +1 @@
-HolmesV[all]==2021.5.6a20
-
-# neon stuff
-neon_speech @ git+https://github.com/NeonGeckoCom/neon_speech
-neon_audio @ git+https://github.com/NeonGeckoCom/neon_audio
-neon_enclosure @ git+https://github.com/NeonGeckoCom/neon_enclosure
-neon-transcripts-controller @ git+https://github.com/NeonGeckoCom/transcripts_controller
-
 neon-core-server @ git+https://github.com/NeonGeckoCom/neon-core-server