refactor/move_to_individual_pkgs

no import * migrate to ovos-bus-client move tests to ovos-gui move tests to ovos-gui default mycroft.conf moved to ovos-config package migrate ovos-bus migrate ovos-gui
OpenVoiceOS · Apr 29, 2023 · f0f8433 · f0f8433
1 parent cb6e1ed
commit f0f8433
Show file tree

Hide file tree

Showing 88 changed files with 91 additions and 3,291 deletions.
diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml
@@ -39,7 +39,7 @@ jobs:
           python setup.py bdist_wheel
       - name: Install package
         run: |
-          pip install .[all,skills-essential]
+          pip install .[all,lgpl]
       - uses: pypa/[email protected]
         with:
           # Ignore setuptools vulnerability we can't do much about

diff --git a/.github/workflows/install_tests.yml b/.github/workflows/install_tests.yml
@@ -56,7 +56,7 @@ jobs:
           sudo apt install swig libfann-dev
       - name: Install package
         run: |
-          pip install .[skills_lgpl]
+          pip install .[all,lgpl]
   install_audio:
     strategy:
       max-parallel: 2

diff --git a/.github/workflows/license_tests.yml b/.github/workflows/license_tests.yml
@@ -26,7 +26,7 @@ jobs:
           sudo apt install python3-dev swig libssl-dev libfann-dev portaudio19-dev libpulse-dev
       - name: Install core repo
         run: |
-          pip install .[audio-backend,mark1,stt,tts,skills,gui,bus,PHAL,all]
+          pip install .[all]
       - name: Get explicit and transitive dependencies
         run: |
           pip freeze > requirements-all.txt

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -50,7 +50,7 @@ jobs:
           python -m pip install build wheel
       - name: Install core repo
         run: |
-          pip install .[audio,mark1,stt,tts,skills,gui,bus,PHAL,all,deprecated]
+          pip install .[all,lgpl,deprecated]
       - name: Install test dependencies
         run: |
           pip install -r requirements/tests.txt

diff --git a/mycroft/__init__.py b/mycroft/__init__.py
@@ -17,9 +17,9 @@
 from ovos_bus_client.message import Message
 
 from ovos_utils.intents import AdaptIntent, IntentBuilder, Intent
-from mycroft.skills.context import adds_context, removes_context
-from mycroft.skills import (MycroftSkill, FallbackSkill,
-                            intent_handler, intent_file_handler)
+from ovos_workshop.decorators import intent_handler, intent_file_handler, adds_context, removes_context
+from ovos_workshop.skills import MycroftSkill
+from ovos_workshop.skills.fallback import FallbackSkill
 from ovos_utils.log import LOG
 
 

diff --git a/mycroft/client/enclosure/base.py b/mycroft/client/enclosure/base.py
@@ -9,4 +9,4 @@
 
 """
 
-from mycroft.deprecated.enclosure.base import *
+from mycroft.deprecated.enclosure.base import Enclosure
diff --git a/mycroft/client/enclosure/generic/__init__.py b/mycroft/client/enclosure/generic/__init__.py
@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 """
 
-from mycroft.deprecated.enclosure.generic import *
+from mycroft.deprecated.enclosure.generic import EnclosureGeneric
diff --git a/mycroft/client/enclosure/mark1/__init__.py b/mycroft/client/enclosure/mark1/__init__.py
@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 """
 
-from mycroft.deprecated.enclosure.mark1 import *
+from mycroft.deprecated.enclosure.mark1 import EnclosureEyes, EnclosureArduino, EnclosureMouth, Enclosure, EnclosureReader, EnclosureWriter, EnclosureMark1
diff --git a/mycroft/client/enclosure/mark1/arduino.py b/mycroft/client/enclosure/mark1/arduino.py
@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 """
 
-from mycroft.deprecated.enclosure.mark1.arduino import *
+from mycroft.deprecated.enclosure.mark1.arduino import EnclosureArduino
diff --git a/mycroft/client/enclosure/mark1/eyes.py b/mycroft/client/enclosure/mark1/eyes.py
@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 """
 
-from mycroft.deprecated.enclosure.mark1.eyes import *
+from mycroft.deprecated.enclosure.mark1.eyes import EnclosureEyes
diff --git a/mycroft/client/enclosure/mark1/mouth.py b/mycroft/client/enclosure/mark1/mouth.py
@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 """
 
-from mycroft.deprecated.enclosure.mark1.mouth import *
+from mycroft.deprecated.enclosure.mark1.mouth import EnclosureMouth
diff --git a/mycroft/client/enclosure/mark2/__init__.py b/mycroft/client/enclosure/mark2/__init__.py
@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 """
 
-from mycroft.deprecated.enclosure.mark2 import *
+from mycroft.deprecated.enclosure.mark2 import EnclosureMark2
diff --git a/mycroft/configuration/config.py b/mycroft/configuration/config.py
@@ -1,4 +1,4 @@
 # backwards compat - moved to own python package
-from ovos_config.config import *
-from ovos_config.locations import *
+from ovos_config.config import Configuration, MycroftUserConfig, MycroftDefaultConfig, MycroftSystemConfig, RemoteConf, LocalConf
+from ovos_config.locations import OLD_USER_CONFIG, DEFAULT_CONFIG, SYSTEM_CONFIG, REMOTE_CONFIG, USER_CONFIG, WEB_CONFIG_CACHE
 
diff --git a/mycroft/configuration/locale.py b/mycroft/configuration/locale.py
@@ -1,2 +1,2 @@
 # backwards compat - moved to own python package
-from ovos_config.locale import *
+from ovos_config.locale import setup_locale, set_default_tz, set_default_lang, set_default_lf_lang, load_language, load_languages, get_default_lang, get_default_tz, get_config_tz, get_primary_lang_code
diff --git a/mycroft/configuration/locations.py b/mycroft/configuration/locations.py
@@ -1,2 +1,2 @@
 # backwards compat - moved to own python package
-from ovos_config.locations import *
+from ovos_config.locations import DEFAULT_CONFIG, OLD_USER_CONFIG, SYSTEM_CONFIG, REMOTE_CONFIG, USER_CONFIG, WEB_CONFIG_CACHE
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@

		"""

		from mycroft.deprecated.enclosure.base import *
		from mycroft.deprecated.enclosure.base import Enclosure