Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update requirements to allow latest OVOS packages #62

Merged
merged 4 commits into from
Sep 13, 2024
Merged

Update requirements to allow latest OVOS packages #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ae3f3e
Update requirements to allow latest OVOS packages
NeonDaniel Sep 13, 2024
dbf6c37
Update `upload-artifact` GHA to resolve failure
NeonDaniel Sep 13, 2024
ecd5c7f
Update for compat. with ovos-gui including backwards-compat wrapper
NeonDaniel Sep 13, 2024
490301c
Deprecate failing Python 3.7 unit tests
NeonDaniel Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
10 changes: 8 additions & 2 deletions neon_gui/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading