From df750560f81248f8277893757b65d96b35c58a18 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com>
Date: Fri, 29 Dec 2023 15:53:35 -0800
Subject: [PATCH] Update dependencies (#82)

* Update ovos-phal dependency and remove patched requirements

* Update for compat. with upstream PHAL changes

* Troubleshooting docker dependency resolution

* Fix typo in deprecation log

---------

Co-authored-by: Daniel McKnight <daniel@neon.ai>
---
 neon_enclosure/admin/service.py |  7 ++++++-
 neon_enclosure/service.py       | 11 ++++++++---
 requirements/docker.txt         |  6 +++---
 requirements/requirements.txt   |  7 ++-----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/neon_enclosure/admin/service.py b/neon_enclosure/admin/service.py
index 10db8cd..661440f 100644
--- a/neon_enclosure/admin/service.py
+++ b/neon_enclosure/admin/service.py
@@ -37,7 +37,12 @@ def __init__(self, skill_id="neon.phal_admin", **kwargs):
         AdminPHAL.__init__(self, skill_id=skill_id, **kwargs)
         self.status.set_alive()
         self.started = Event()
-        self.config = self.config or dict()  # TODO: Fixed in ovos_PHAL 0.0.5a1
+
+    @property
+    def config(self):
+        from ovos_utils.log import log_deprecation
+        log_deprecation("Reference `admin_config`", "2.0.0")
+        return self.admin_config
 
     def start(self):
         LOG.info("Starting Admin PHAL")
diff --git a/neon_enclosure/service.py b/neon_enclosure/service.py
index 2b7cb09..1e4d6e0 100644
--- a/neon_enclosure/service.py
+++ b/neon_enclosure/service.py
@@ -40,11 +40,16 @@ def __init__(self, skill_id="neon.phal", **kwargs):
         PHAL.__init__(self, skill_id=skill_id, **kwargs)
         self.status.set_alive()
         self.started = Event()
-        self.config = self.config or dict()  # TODO: Fixed in ovos_PHAL 0.0.5a1
+
+    @property
+    def config(self):
+        from ovos_utils.log import log_deprecation
+        log_deprecation("Reference `user_config`", "2.0.0")
+        return self.user_config
 
     def start(self):
         LOG.debug("Starting PHAL")
-        if self.config.get('wait_for_gui'):
+        if self.user_config.get('wait_for_gui'):
             LOG.info("Waiting for GUI Service to start")
             timeout = time() + 30
             while time() < timeout:
@@ -59,7 +64,7 @@ def start(self):
     def load_plugins(self):
         for name, plug in find_phal_plugins().items():
             LOG.info(f"Loading {name}")
-            config = self.config.get(name) or {}
+            config = self.user_config.get(name) or {}
             try:
                 if hasattr(plug, "validator"):
                     enabled = plug.validator.validate(config)
diff --git a/requirements/docker.txt b/requirements/docker.txt
index 9db4b1c..62dc2b7 100644
--- a/requirements/docker.txt
+++ b/requirements/docker.txt
@@ -1,7 +1,7 @@
-ovos-phal-plugin-homeassistant~=0.0.1
+ovos-phal-plugin-homeassistant~=0.0.3
 ovos-phal-plugin-notification-widgets~=1.0.0
 ovos-phal-plugin-color-scheme-manager~=1.0.0
 ovos-phal-plugin-configuration-provider~=1.0.0
-ovos-phal-plugin-dashboard~=0.0.1
-ovos-phal-plugin-connectivity-events~=0.0.2
+ovos-phal-plugin-connectivity-events~=0.0.3
+ovos-phal-plugin-oauth~=0.0.2,>=0.0.3a1
 neon-phal-plugin-monitoring~=0.0.1
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index d17aca8..b90e43e 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,10 +1,7 @@
-ovos-phal~=0.0.4
+ovos-phal~=0.0.4,>=0.0.5a15
 neon_utils[network]~=1.6
 ovos_utils~=0.0.32
 click~=8.0
 click-default-group~=1.2
-ovos-bus-client~=0.0.4
+ovos-bus-client~=0.0.8
 
-# TODO: Patching ovos_PHAL inherited dependencies
-ovos_backend_client~=0.0.6
-mycroft-messagebus-client~=0.10