Update requirements to allow latest OVOS packages (#62)

* Update requirements to allow latest OVOS packages * Update `upload-artifact` GHA to resolve failure * Update for compat. with ovos-gui including backwards-compat wrapper * Deprecate failing Python 3.7 unit tests --------- Co-authored-by: Daniel McKnight <[email protected]>
NeonGeckoCom · Sep 13, 2024 · 7f64ec3 · 7f64ec3
1 parent e553a21
commit 7f64ec3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -18,7 +18,7 @@ jobs:
     timeout-minutes: 15
     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
@@ -38,16 +38,16 @@ jobs:
         run: |
           pytest tests/util_tests.py --doctest-modules --junitxml=tests/util-test-results.xml
       - name: Upload utils test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: util-test-results
+          name: util-test-results-${{ matrix.python-version }}
           path: tests/util-test-results.xml
 
       - name: Test Service
         run: |
           pytest tests/test_gui_service.py --doctest-modules --junitxml=tests/gui-service-test-results.xml
       - name: Upload GUI Service test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: gui-service-test-results
+          name: gui-service-test-results-${{ matrix.python-version }}
           path: tests/gui-service-test-results.xml
diff --git a/neon_gui/service.py b/neon_gui/service.py
@@ -29,7 +29,7 @@
 from time import sleep
 from tornado import ioloop
 from threading import Thread, Event
-from ovos_utils.log import LOG
+from ovos_utils.log import LOG, log_deprecation
 from ovos_gui.service import GUIService
 
 from neon_gui.utils import update_gui_ip_address
@@ -80,6 +80,12 @@ def __init__(self, ready_hook=on_ready, error_hook=on_error,
                             started_hook=started_hook, ready_hook=ready_hook,
                             error_hook=error_hook, stopping_hook=stopping_hook)
 
+    @property
+    def gui(self):
+        log_deprecation("`self.gui` has been replaced by "
+                        "`self.namespace_manager`", "2.0.0")
+        return self.namespace_manager
+
     def run(self):
         self.status.set_started()
         GUIService.run(self)
@@ -89,7 +95,7 @@ def run(self):
     def shutdown(self):
         LOG.info("GUI Service shutting down")
         self.status.set_stopping()
-        self.gui.core_bus.close()
+        self.namespace_manager.core_bus.close()
         self.bus.close()
 
         loop = ioloop.IOLoop.instance()

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,8 +1,8 @@
 neon-utils[network]~=1.6
 ovos-utils~=0.0,>=0.0.34
-ovos-config~=0.0.10
+ovos-config~=0.0,>=0.0.10
 click~=8.0
 click-default-group~=1.2
 tornado~=6.0
-ovos-bus-client~=0.0.5
-ovos-gui~=0.0.3
+ovos-bus-client~=0.0,>=0.0.5
+ovos-gui~=0.2