requirements:latest stable packages (#563)

* requirements:latest stable packages

* requirements:latest stable packages

* requirements:latest stable packages

* requirements:latest stable packages

* requirements:latest stable packages

* requirements:latest stable packages

* fix import

* fix imports

* fix imports

* move tests to ovos-workshop

* dont require latest workshop, just allow it

mycroft/__init__.py

@@ -18,7 +18,7 @@
 
 from ovos_workshop.intents import IntentBuilder, Intent
 from ovos_workshop.decorators import intent_handler, intent_file_handler, adds_context, removes_context
-from ovos_workshop.skills.mycroft_skill import MycroftSkill
+from ovos_workshop.skills.ovos import OVOSSkill as MycroftSkill
 from ovos_workshop.skills.fallback import FallbackSkill
 from ovos_utils.log import LOG
 

mycroft/enclosure/gui.py

@@ -8,4 +8,4 @@
 to be a drop in replacement for mycroft-core
 
 """
-from ovos_workshop.skills.base import SkillGUI
+from ovos_workshop.skills.ovos import SkillGUI

mycroft/gui/__init__.py

@@ -1,3 +1,3 @@
 # backwards compat imports
 from ovos_bus_client.apis.gui import GUIInterface
-from ovos_workshop.skills.base import SkillGUI
+from ovos_workshop.skills.ovos import SkillGUI

mycroft/skills/__init__.py

@@ -22,7 +22,7 @@
                                           resting_screen_handler,
                                           skill_api_method)
 from ovos_workshop.skills.fallback import FallbackSkill
-from ovos_workshop.skills.mycroft_skill import MycroftSkill
+from ovos_workshop.skills.ovos import OVOSSkill as MycroftSkill
 from mycroft.skills.common_iot_skill import CommonIoTSkill
 from mycroft.skills.common_play_skill import CommonPlaySkill, CPSMatchLevel
 from mycroft.skills.common_query_skill import CommonQuerySkill, CQSMatchLevel

mycroft/skills/common_iot_skill.py

@@ -24,7 +24,7 @@
 from functools import total_ordering, wraps
 from itertools import count
 
-from ovos_workshop.skills.mycroft_skill import MycroftSkill
+from ovos_workshop.skills.ovos import OVOSSkill as MycroftSkill
 from ovos_bus_client.message import Message, dig_for_message
 
 ENTITY = "ENTITY"

mycroft/skills/core.py

@@ -20,7 +20,7 @@
 # Import moved methods for backwards compatibility
 # This will need to remain here for quite some time since removing it
 # would break most of the skills out there.
-from ovos_workshop.skills.mycroft_skill import MycroftSkill
+from ovos_workshop.skills.ovos import OVOSSkill as MycroftSkill
 from ovos_workshop.skills.fallback import FallbackSkill
 from mycroft.skills.mycroft_skill import resting_screen_handler, intent_handler, intent_file_handler, skill_api_method
 

mycroft/skills/mycroft_skill/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from ovos_workshop.skills.mycroft_skill import MycroftSkill
+from ovos_workshop.skills.ovos import OVOSSkill as MycroftSkill
 from ovos_utils.events import get_handler_name
 from mycroft.skills.mycroft_skill.decorators import (intent_handler,
                                                      intent_file_handler,

mycroft/skills/mycroft_skill/mycroft_skill.py

@@ -17,7 +17,7 @@
 # backwards compat imports, do not delete!
 from ovos_workshop.intents import Intent, IntentBuilder, IntentServiceInterface, to_alnum
 from ovos_utils.skills import get_non_properties
-from ovos_workshop.skills.base import SkillGUI
+from ovos_workshop.skills.ovos import SkillGUI
 from ovos_bus_client.message import Message, dig_for_message
 from mycroft.metrics import report_metric
 from ovos_bus_client.util.scheduler import EventScheduler, EventSchedulerInterface
@@ -29,4 +29,4 @@
     read_vocab_file, read_value_file, read_translated_file,
     load_vocabulary, load_regex)
 from mycroft.deprecated.skills.settings import SettingsMetaUploader
-from ovos_workshop.skills.mycroft_skill import MycroftSkill
+from ovos_workshop.skills.ovos import OVOSSkill as MycroftSkill

ovos_core/intent_services/fallback_service.py

@@ -23,7 +23,7 @@
 from ovos_plugin_manager.templates.pipeline import IntentMatch, PipelinePlugin
 from ovos_utils import flatten_list
 from ovos_utils.log import LOG
-from ovos_workshop.skills.fallback import FallbackMode
+from ovos_workshop.permissions import FallbackMode
 
 FallbackRange = namedtuple('FallbackRange', ['start', 'stop'])
 

requirements/extra-deprecated.txt

@@ -6,4 +6,11 @@ python-vlc>=1.1.2
 pyalsaaudio>=0.8
 pyserial>=3.0
 pillow>=8.3
-pyaudio
+pyaudio
+
+# mycroft-core imports / default plugins
+# for compat with mycroft namespace
+ovos-listener>=0.0.3,<1.0.0
+ovos-tts-plugin-mimic>=0.2.8, <1.0.0
+ovos-ww-plugin-precise>=0.1, <1.0.0
+ovos-ww-plugin-pocketsphinx>=0.1, <1.0.0

requirements/lgpl.txt

@@ -1,2 +1,2 @@
-ovos_padatious>=0.1.0,<1.0.0
-fann2>=1.0.7, < 1.1.0
+ovos_padatious>=0.1.2,<1.0.0
+fann2>=1.0.7, < 1.1.0

requirements/mycroft.txt

@@ -1,14 +1,6 @@
-# all ovos core modules, a full install like mycroft-core
-ovos_PHAL[extras]>=0.0.5,<1.0.0
-ovos-audio[extras]>=0.0.0,<1.0.0
-ovos-gui[extras]>=0.0.4,<1.0.0
-ovos-messagebus>=0.0.1,<1.0.0
-ovos-dinkum-listener[extras]>=0.0.1,<1.0.0
-
-# mycroft-core imports / default plugins
-# for compat with mycroft namespace
-ovos-listener>=0.0.3,<1.0.0
-ovos-tts-plugin-mimic>=0.2.8, <1.0.0
-ovos-ww-plugin-precise>=0.1, <1.0.0
-ovos-ww-plugin-pocketsphinx>=0.1, <1.0.0
-
+# all ovos core modules, a full install like mycroft-core used to do
+ovos_PHAL[extras]>=0.2.5,<1.0.0
+ovos-audio[extras]>=0.2.4,<1.0.0
+ovos-gui[extras]>=0.2.2,<1.0.0
+ovos-messagebus>=0.0.6,<1.0.0
+ovos-dinkum-listener[extras]>=0.2.1,<1.0.0

requirements/plugins.txt

@@ -1,8 +1,8 @@
-ovos-utterance-corrections-plugin>=0.0.0, <1.0.0
-ovos-utterance-plugin-cancel>=0.0.1, <1.0.0
-ovos-bidirectional-translation-plugin>=0.0.1, <1.0.0
-ovos-translate-server-plugin>=0.0.1, <1.0.0
-ovos-utterance-normalizer>=0.1.0, <1.0.0
+ovos-utterance-corrections-plugin>=0.0.2, <1.0.0
+ovos-utterance-plugin-cancel>=0.2.0, <1.0.0
+ovos-bidirectional-translation-plugin>=0.1.0, <1.0.0
+ovos-translate-server-plugin>=0.0.2, <1.0.0
+ovos-utterance-normalizer>=0.2.1, <1.0.0
 
 # still in alpha
 ovos-classifiers

requirements/requirements.txt

@@ -4,14 +4,14 @@ watchdog>=2.1, <3.0
 combo-lock>=0.2.2, <0.3
 
 padacioso>=0.2.2,<1.0.0
-ovos-adapt-parser>=0.1.1, <1.0.0
-ovos_ocp_pipeline_plugin>=0.1.0, <1.0.0
-ovos-common-query-pipeline-plugin>=0.1.0, <1.0.0
+ovos-adapt-parser>=0.1.2, <1.0.0
+ovos_ocp_pipeline_plugin>=0.1.2, <1.0.0
+ovos-common-query-pipeline-plugin>=0.1.2, <1.0.0
 
 ovos-utils>=0.1.0,<1.0.0
 ovos_bus_client>=0.1.0,<1.0.0
 ovos-plugin-manager>=0.0.26,<1.0.0
 ovos-config>=0.0.13,<1.0.0
 ovos-lingua-franca>=0.4.7,<1.0.0
 ovos-backend-client>=0.1.0,<2.0.0
-ovos-workshop>=0.0.16,<1.0.0
+ovos-workshop>=0.0.16,<2.0.0

requirements/skills-audio.txt

@@ -1,7 +1,7 @@
 # skills that run in audio enabled devices (require mic/speaker)
-ovos-skill-boot-finished>=0.1.0,<1.0.0
-ovos-skill-audio-recording>=0.1.0,<1.0.0
-ovos-skill-dictation>=0.1.0,<1.0.0
-ovos-skill-parrot>=0.0.1,<1.0.0
-ovos-skill-volume>=0.0.2,<1.0.0
-ovos-skill-naptime>=0.2.3,<1.0.0
+ovos-skill-boot-finished>=0.2.1,<1.0.0
+ovos-skill-audio-recording>=0.2.2,<1.0.0
+ovos-skill-dictation>=0.2.0,<1.0.0
+ovos-skill-parrot>=0.1.2,<1.0.0
+ovos-skill-volume>=0.1.1,<1.0.0
+ovos-skill-naptime>=0.3.1,<1.0.0

requirements/skills-desktop.txt

@@ -1,2 +1,2 @@
 # skills that require a linux desktop environment
-ovos-skill-application-launcher>=0.1.0,<1.0.0
+ovos-skill-application-launcher>=0.2.1,<1.0.0

requirements/skills-essential.txt

@@ -1,9 +1,9 @@
 # skills providing core functionality (offline)
-ovos-skill-fallback-unknown>=0.0.4,<1.0.0
-ovos-skill-alerts>=0.0.1,<1.0.0
-ovos-skill-personal>=0.0.4,<1.0.0
-ovos-skill-date-time>=0.2.3,<1.0.0
-ovos-skill-hello-world>=0.0.4,<1.0.0
-skill-wordnet>=0.0.1,<1.0.0
+ovos-skill-fallback-unknown>=0.1.2,<1.0.0
+ovos-skill-alerts>=0.1.2,<1.0.0
+ovos-skill-personal>=0.1.4,<1.0.0
+ovos-skill-date-time>=0.3.2,<1.0.0
+ovos-skill-hello-world>=0.1.6,<1.0.0
+skill-wordnet>=0.0.4,<1.0.0
 #skill-randomness>=0.0.1,<1.0.0
-ovos-skill-spelling>=0.1.0,<1.0.0
+ovos-skill-spelling>=0.2.2,<1.0.0

requirements/skills-gui.txt

@@ -1 +1 @@
-ovos-skill-homescreen>=0.0.3,<1.0.0
+ovos-skill-homescreen>=1.0.2,<2.0.0

requirements/skills-internet.txt

@@ -1,9 +1,9 @@
 # skills that require internet connectivity, should not be installed in offline devices
-ovos-skill-weather>=0.0.1,<1.0.0
-skill-ddg>=0.0.2,<1.0.0
-skill-wolfie>=0.2.0,<1.0.0
-ovos-skill-wikipedia>=0.5.0,<1.0.0
-skill-ovos-fallback-chatgpt>=0.0.2,<1.0.0
-ovos-skill-wikihow>=0.2.0,<1.0.0
-ovos-skill-speedtest>=0.1.0,<1.0.0
-ovos-skill-ip>=0.1.0,<1.0.0
+ovos-skill-weather>=0.1.1,<1.0.0
+skill-ddg>=0.1.2,<1.0.0
+skill-wolfie>=0.2.3,<1.0.0
+ovos-skill-wikipedia>=0.5.2,<1.0.0
+skill-ovos-fallback-chatgpt>=0.1.2,<1.0.0
+ovos-skill-wikihow>=0.2.3,<1.0.0
+ovos-skill-speedtest>=0.2.1,<1.0.0
+ovos-skill-ip>=0.2.2,<1.0.0

requirements/skills-media.txt

@@ -1,6 +1,5 @@
 # skills for OCP, require audio playback plugins (usually mpv)
-ovos-skill-somafm>=0.0.2,<1.0.0
-skill-news>=0.0.4,<1.0.0
+ovos-skill-somafm>=0.1.1,<1.0.0
+skill-news>=0.1.2,<1.0.0
 ovos-skill-pyradios>=0.1.0,<1.0.0
-ovos-skill-local-media>=0.2.0,<1.0.0
-ovos-skill-youtube-music>=0.1.1,<1.0.0
+ovos-skill-local-media>=0.2.1,<1.0.0