From fe59c28f7cb47f6d891ca13490da074b615a6761 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:55:47 +0000 Subject: [PATCH 1/5] rename RuntimeRequirements --- __init__.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/__init__.py b/__init__.py index 3f1342c..5668132 100755 --- a/__init__.py +++ b/__init__.py @@ -9,6 +9,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + elif extension_id == "mobile": + self.extension = MobileExtension(self.bus, self.gui) # from enum import Enum from time import sleep @@ -27,7 +29,9 @@ from ovos_utils.network_utils import is_connected from ovos_workshop.decorators import killable_event from ovos_workshop.skills import OVOSSkill -from ovos_workshop.skills.base import SkillNetworkRequirements, classproperty +from ovos_utils.process_utils import RuntimeRequirements +from ovos_utils import classproperty + class SetupState(str, Enum): @@ -243,14 +247,17 @@ def __init__(self): self.selected_language = None @classproperty - def network_requirements(self): - SkillNetworkRequirements(internet_before_load=False, - network_before_load=False, - requires_internet=False, - requires_network=False, - no_internet_fallback=True, - no_network_fallback=True) - return SkillNetworkRequirements() + def runtime_requirements(self): + RuntimeRequirements(internet_before_load=False, + network_before_load=False, + hui_before_load=False, + requires_internet=False, + requires_network=False, + requires_gui=False, + no_internet_fallback=True, + no_network_fallback=True, + no_gui_fallback=True) + return RuntimeRequirements() @property def pairing_mode(self): From 6cac06497ecfe4f39d06d4972a58f96391943029 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:56:23 +0000 Subject: [PATCH 2/5] Update __init__.py --- __init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/__init__.py b/__init__.py index 5668132..91ffe65 100755 --- a/__init__.py +++ b/__init__.py @@ -9,8 +9,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - elif extension_id == "mobile": - self.extension = MobileExtension(self.bus, self.gui) # from enum import Enum from time import sleep From 7529c928b6d74813efb674a6b721632d1d3a627e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:57:18 +0000 Subject: [PATCH 3/5] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index eb7e3ff..73972f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -ovos_workshop~=0.0, >=0.0.10 +ovos_workshop~=0.0, >=0.0.11a4 ovos_backend_client~=0.0, >=0.0.6a8 ovos-PHAL-plugin-system>=0.0.2a5 ovos-plugin-manager>=0.0.19 -ovos_utils>=0.0.25 +ovos-utils~=0.0, >=0.0.28a4 From a585ca3917eec8926a0efed28f03fa924eac9ba5 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Thu, 9 Feb 2023 20:01:00 +0000 Subject: [PATCH 4/5] Update __init__.py --- __init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index 91ffe65..5639efc 100755 --- a/__init__.py +++ b/__init__.py @@ -246,7 +246,7 @@ def __init__(self): @classproperty def runtime_requirements(self): - RuntimeRequirements(internet_before_load=False, + return RuntimeRequirements(internet_before_load=False, network_before_load=False, hui_before_load=False, requires_internet=False, @@ -255,7 +255,6 @@ def runtime_requirements(self): no_internet_fallback=True, no_network_fallback=True, no_gui_fallback=True) - return RuntimeRequirements() @property def pairing_mode(self): From 6e84255fc886fc66948ae21de8de86b017727089 Mon Sep 17 00:00:00 2001 From: jarbasai Date: Thu, 9 Feb 2023 20:23:07 +0000 Subject: [PATCH 5/5] feat/runtime_requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 73972f2..2137b14 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -ovos_workshop~=0.0, >=0.0.11a4 ovos_backend_client~=0.0, >=0.0.6a8 ovos-PHAL-plugin-system>=0.0.2a5 ovos-plugin-manager>=0.0.19 ovos-utils~=0.0, >=0.0.28a4 +ovos_workshop~=0.0, >=0.0.11a4 \ No newline at end of file