From 90e93a3c2c61c038b44c43facd503f1de84db155 Mon Sep 17 00:00:00 2001
From: miro <jarbasai@mailfence.com>
Date: Wed, 6 Nov 2024 02:58:23 +0000
Subject: [PATCH] fix: allow latest bus client version

---
 .github/workflows/end2end_tests.yml | 2 +-
 .github/workflows/mycroft_tests.yml | 3 +--
 requirements/extra-deprecated.txt   | 1 +
 requirements/mycroft.txt            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/end2end_tests.yml b/.github/workflows/end2end_tests.yml
index e628d48bfac..9ceffdb318b 100644
--- a/.github/workflows/end2end_tests.yml
+++ b/.github/workflows/end2end_tests.yml
@@ -65,7 +65,7 @@ jobs:
           pip install ./test/end2end/metadata-test-plugin
       - name: Install core repo
         run: |
-          pip install -e .[plugins]
+          pip install -e .[plugins] ovos-bus-client==1.0.0
       - name: Run end2end tests
         run: |
           pytest --cov-append --cov=ovos_core --cov-report xml test/end2end
diff --git a/.github/workflows/mycroft_tests.yml b/.github/workflows/mycroft_tests.yml
index ca617a4b0ab..8bdb4a9434c 100644
--- a/.github/workflows/mycroft_tests.yml
+++ b/.github/workflows/mycroft_tests.yml
@@ -39,8 +39,7 @@ jobs:
           pip install -r requirements/tests.txt
       - name: Install core repo
         run: |
-          pip install -e .[deprecated]
-          pip install -e .[mycroft,plugins]
+          pip install -e .[mycroft,plugins,deprecated]
       - name: Run mycroft compat tests
         run: |
           pytest test/backwards_compat
\ No newline at end of file
diff --git a/requirements/extra-deprecated.txt b/requirements/extra-deprecated.txt
index bfcea171d34..2760f4b4b63 100644
--- a/requirements/extra-deprecated.txt
+++ b/requirements/extra-deprecated.txt
@@ -10,6 +10,7 @@ pyaudio
 
 # mycroft-core imports / default plugins
 # for compat with mycroft namespace
+# NOTE: ovos-listener is causing conflicts in dependency resolution, blocks ovos-bus-client 1.0.0
 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
diff --git a/requirements/mycroft.txt b/requirements/mycroft.txt
index 782983febe8..433a17466f8 100644
--- a/requirements/mycroft.txt
+++ b/requirements/mycroft.txt
@@ -1,6 +1,6 @@
 # all ovos core modules, a full install like mycroft-core used to do
 ovos_PHAL[extras]>=0.2.7,<1.0.0
 ovos-audio[extras]>=0.3.1,<1.0.0
-ovos-gui[extras]>=1.0.0,<2.0.0
+ovos-gui[extras]>=0.2.2,<2.0.0
 ovos-messagebus>=0.0.7,<1.0.0
 ovos-dinkum-listener[extras]>=0.3.2,<1.0.0
\ No newline at end of file