bump requirements (#101)

* bump requirements * Update requirements.txt * dont care about old mycroft-core anymore * dont care about old mycroft-core anymore * dont care about old mycroft-core anymore * dont care about old mycroft-core anymore
OpenVoiceOS · Dec 29, 2023 · 05a08e6 · 05a08e6
1 parent fc2d267
commit 05a08e6
Show file tree

Hide file tree

Showing 32 changed files with 24 additions and 519 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -34,7 +34,7 @@ jobs:
   unit_tests:
     strategy:
       matrix:
-        python-version: [ 3.7, 3.8, 3.9, "3.10" ]
+        python-version: [ 3.8, 3.9, "3.10" ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -60,48 +60,6 @@ jobs:
           # NOTE: additional pytest invocations should also add the --cov-append flag
           #       or they will overwrite previous invocations' coverage reports
           #       (for an example, see OVOS Skill Manager's workflow)
-      - name: Upload coverage
-        env:
-          CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
-        uses: codecov/codecov-action@v2
-  unit_tests_mycroft:
-    needs:
-      - unit_tests
-    strategy:
-      matrix:
-        python-version: [ 3.7, 3.8, 3.9, "3.10" ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install System Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt install python3-dev
-          python -m pip install build wheel
-          pip install wheel "cython<3.0.0"  # TODO: cython patching https://github.com/yaml/pyyaml/issues/724
-          pip install --no-build-isolation pyyaml~=5.4  # TODO: patching https://github.com/yaml/pyyaml/issues/724
-      - name: Install core repo
-        run: |
-          sudo apt install libssl-dev libfann-dev portaudio19-dev libpulse-dev
-          pip install git+https://github.com/MycroftAI/mycroft-core
-      - name: Install OCP
-        run: |
-          pip install .
-      - name: Install test dependencies
-        run: |
-          pip install ./test/ovos-test-mycroft-audio-plugin
-          pip install ./test/ovos-test-ocp-audio-plugin
-          pip install pytest pytest-timeout pytest-cov
-      - name: Run mycroft unittests
-        run: |
-          pytest --cov-append --cov=ovos_plugin_common_play --cov-report xml test/unittests
-          # NOTE: additional pytest invocations should also add the --cov-append flag
-          #       or they will overwrite previous invocations' coverage reports
-          #       (for an example, see OVOS Skill Manager's workflow)
       - name: Upload coverage
         env:
           CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}

diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ dist
 
 # Created by unit tests
 .pytest_cache/
+/.gtm/
diff --git a/ovos_plugin_common_play/ocp/__init__.py b/ovos_plugin_common_play/ocp/__init__.py
@@ -8,10 +8,9 @@
 from ovos_utils.gui import can_use_gui
 from ovos_utils.log import LOG
 from ovos_plugin_common_play.ocp.utils import create_desktop_file
-from ovos_utils.messagebus import Message
+from ovos_bus_client.message import Message
 from ovos_workshop import OVOSAbstractApplication
 from padacioso import IntentContainer
-from ovos_utils.intents.intent_service_interface import IntentQueryApi
 from threading import Event, Lock
 
 
@@ -104,19 +103,6 @@ def handle_home(self, message=None):
     def register_ocp_intents(self, message=None):
         with self._intent_registration_lock:
             if not self._intents_event.is_set():
-                missing = True
-                LOG.debug("Intents register event not set")
-            else:
-                # check list of registered intents
-                # if needed register ocp intents again
-                # this accounts for restarts etc
-                i = IntentQueryApi(self.bus)
-                intents = i.get_padatious_manifest()
-                missing = not any((e.startswith(f"{self.skill_id}:")
-                                  for e in intents))
-                LOG.debug(f'missing={missing} | {intents}')
-
-            if missing:
                 LOG.info(f"OCP intents missing, registering for {self}")
                 self.register_intent("play.intent", self.handle_play)
                 self.register_intent("read.intent", self.handle_read)

diff --git a/ovos_plugin_common_play/ocp/gui.py b/ovos_plugin_common_play/ocp/gui.py
@@ -6,7 +6,7 @@
 from ovos_bus_client.message import Message
 from ovos_config import Configuration
 from ovos_utils.events import EventSchedulerInterface
-from ovos_utils.gui import GUIInterface
+from ovos_bus_client.apis.gui import GUIInterface
 from ovos_utils.log import LOG
 
 from ovos_plugin_common_play.ocp.status import *

diff --git a/ovos_plugin_common_play/ocp/media.py b/ovos_plugin_common_play/ocp/media.py
@@ -6,7 +6,7 @@
 from ovos_plugin_common_play.ocp.utils import ocp_plugins, find_mime
 from ovos_utils.json_helper import merge_dict
 from ovos_utils.log import LOG
-from ovos_utils.messagebus import Message
+from ovos_bus_client.message import Message
 from os.path import join, dirname
 from dbus_next.service import Variant
 

diff --git a/ovos_plugin_common_play/ocp/mycroft_cps.py b/ovos_plugin_common_play/ocp/mycroft_cps.py
@@ -5,7 +5,8 @@
 from ovos_bus_client.message import dig_for_message
 
 from ovos_plugin_common_play.ocp.constants import OCP_ID
-from ovos_utils.messagebus import Message, wait_for_reply
+from ovos_bus_client.message import Message
+from ovos_bus_client.util import wait_for_reply
 
 from ovos_plugin_common_play.ocp.base import OCPAbstractComponent
 from ovos_plugin_common_play.ocp.status import *

diff --git a/ovos_plugin_common_play/ocp/player.py b/ovos_plugin_common_play/ocp/player.py
@@ -6,7 +6,7 @@
 
 from ovos_utils.gui import is_gui_connected, is_gui_running
 from ovos_utils.log import LOG
-from ovos_utils.messagebus import Message
+from ovos_bus_client.message import Message
 from ovos_config import Configuration
 
 from ovos_plugin_common_play.ocp.gui import OCPMediaPlayerGUI

diff --git a/ovos_plugin_common_play/ocp/search.py b/ovos_plugin_common_play/ocp/search.py
@@ -8,7 +8,8 @@
 from ovos_config.locations import get_xdg_config_save_path
 from ovos_utils.gui import is_gui_connected, is_gui_running
 from ovos_utils.log import LOG
-from ovos_utils.messagebus import Message, get_mycroft_bus
+from ovos_bus_client.message import Message
+from ovos_bus_client.util import get_mycroft_bus
 
 from ovos_plugin_common_play.ocp.base import OCPAbstractComponent
 from ovos_plugin_common_play.ocp.media import Playlist

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,7 +1,7 @@
-ovos-plugin-manager >= 0.0.24, < 0.1.0
-ovos-bus-client>=0.0.5, < 0.1.0
-ovos-utils>=0.0.35, < 0.1.0
-ovos_workshop >=0.0.12, < 0.1.0
+ovos-plugin-manager >= 0.0.25a4, < 0.1.0
+ovos-bus-client>=0.0.7, < 0.1.0
+ovos-utils==0.0.37
+ovos_workshop >=0.0.15a2, < 0.1.0
 ovos-ocp-files-plugin~=0.13
 padacioso~=0.2, >=0.1.1
 dbus-next
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -4,6 +4,7 @@ pytest~=7.1
 pytest-timeout~=2.1
 pytest-cov~=4.1
 ovos-core~=0.0.7
+ovos-audio
 
 # TODO: Below patching skills_lgpl pyyaml dependency per https://github.com/yaml/pyyaml/issues/724
 adapt-parser~=0.5

diff --git a/test/ovos-test-mycroft-audio-plugin/ovos_test_mycroft_audio_plugin/__init__.py b/test/ovos-test-mycroft-audio-plugin/ovos_test_mycroft_audio_plugin/__init__.py
@@ -1,4 +1,4 @@
-from mycroft.audio.services import AudioBackend
+from ovos_plugin_manager.templates.audio import AudioBackend
 
 
 class TestMycroftAudioService(AudioBackend):

diff --git a/test/unittests/ovos_tskill_mycroft_cps/README.md b/test/unittests/ovos_tskill_mycroft_cps/README.md
diff --git a/test/unittests/ovos_tskill_mycroft_cps/__init__.py b/test/unittests/ovos_tskill_mycroft_cps/__init__.py
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/.gitkeep b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/.gitkeep
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Music.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Music.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Next.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Next.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Pause.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Pause.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Play.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Play.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/PlayResume.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/PlayResume.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Prev.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Prev.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Resume.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Resume.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Track.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/Track.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/cant.play.dialog b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/cant.play.dialog
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/converse_resume.voc b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/converse_resume.voc
diff --git a/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/just.one.moment.dialog b/test/unittests/ovos_tskill_mycroft_cps/locale/en-us/just.one.moment.dialog
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ dist

		# Created by unit tests
		.pytest_cache/
		/.gtm/