Compare commits
30 Commits
ccdfce74e5
...
dcaf6f63e0
Author | SHA1 | Date |
---|---|---|
j1nx | dcaf6f63e0 | |
j1nx | d1b60daa8e | |
j1nx | 6425d56c71 | |
j1nx | 418959b0fc | |
j1nx | e06ff91d91 | |
j1nx | 40d8d62c6e | |
j1nx | 73c2051e92 | |
j1nx | c8ec03df12 | |
j1nx | 927cc56776 | |
j1nx | e853ddb943 | |
j1nx | 7d27d02c42 | |
j1nx | 266d7ae09c | |
j1nx | 3d476a1130 | |
j1nx | f766471456 | |
j1nx | 76c4fef670 | |
j1nx | a6ce3ff7a4 | |
j1nx | 06a58c2c10 | |
j1nx | 55b998a6e0 | |
j1nx | e99d609f3d | |
j1nx | b7ed6fc8da | |
j1nx | 911e55562b | |
j1nx | 73d7ee6d34 | |
j1nx | 8083952da1 | |
j1nx | da256fef7f | |
j1nx | 1192a1f1b4 | |
j1nx | 938ac90a9c | |
j1nx | 5dda6f0b2e | |
j1nx | 5636832b55 | |
j1nx | d3582092a4 | |
j1nx | 9c65ec20c1 |
|
@ -191,7 +191,6 @@ menu "Additional external python modules"
|
|||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-msk/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-msm/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-multi-key-dict/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-mycroft-messagebus-client/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-lang-plugin-libretranslate/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-phal-plugin-fan/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-phal-plugin-linear-led/Config.in"
|
||||
|
@ -210,6 +209,7 @@ menu "Additional external python modules"
|
|||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-padatious/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-pafy/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-pako/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-pendulum/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-pep8/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-petact/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-phoneme-guesser/Config.in"
|
||||
|
@ -280,15 +280,21 @@ endmenu
|
|||
menu "OpenVoiceOS - Personal Assistant"
|
||||
menu "Core"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-gui/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-audio/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-classifiers/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-cli-client/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-config/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-core/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-gui/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-listener/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-messagebus/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-service/Config.in"
|
||||
endmenu
|
||||
menu "Plugins"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-audio-plugin-simple/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-backend-client/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-backend-manager/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-bus-client/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-config-assistant/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-lingua-franca/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-local-backend/Config.in"
|
||||
|
@ -330,9 +336,9 @@ menu "Plugins"
|
|||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-chromium/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-pocketsphinx/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-selene/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-server/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-vosk/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-whispercpp/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-server-plugin/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-tts-plugin-larynx_server/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-marytts/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic/Config.in"
|
||||
|
|
|
@ -578,7 +578,6 @@ BR2_PACKAGE_PYTHON_MEMORY_TEMPFILE=y
|
|||
BR2_PACKAGE_PYTHON_MOCK_MSM=y
|
||||
BR2_PACKAGE_PYTHON_MSM=y
|
||||
BR2_PACKAGE_PYTHON_MULTI_KEY_DICT=y
|
||||
BR2_PACKAGE_PYTHON_MYCROFT_MESSAGEBUS_CLIENT=y
|
||||
BR2_PACKAGE_PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE=y
|
||||
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_DDG=y
|
||||
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_WIKIPEDIA=y
|
||||
|
@ -634,12 +633,18 @@ BR2_PACKAGE_PYTHON_YAGMAIL=y
|
|||
BR2_PACKAGE_PYTHON_YOUTUBE_DL=y
|
||||
BR2_PACKAGE_PYTHON_YOUTUBE_SEARCHER=y
|
||||
BR2_PACKAGE_PYTHON_YT_DLP=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_AUDIO=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_CLASSIFIERS=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_CLI_CLIENT=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_CONFIG=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_CORE=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_GUI=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_LISTENER=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_MESSAGEBUS=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_AUDIO_PLUGIN_SIMPLE=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_BACKEND_CLIENT=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_BACKEND_MANAGER=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_BUS_CLIENT=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_CONFIG_ASSISTANT=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_LINGUA_FRANCA=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y
|
||||
|
@ -667,8 +672,8 @@ BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=y
|
|||
BR2_PACKAGE_PYTHON_OVOS_STT_HTTP_SERVER=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_CHROMIUM=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_SELENE=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_SERVER=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_VOSK=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_STT_SERVER_PLUGIN=y
|
||||
BR2_PACKAGE_PYTHON_NEON_TTS_PLUGIN_LARYNX_SERVER=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MARYTTS=y
|
||||
BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC=y
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
From d49aa5b51128d0bf38fb902a57d1965e8983af5f Mon Sep 17 00:00:00 2001
|
||||
From 80e6b553e2e5343e5b8064bfe8af86264e3227d4 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Tue, 27 Jul 2021 15:01:43 +0200
|
||||
Date: Sun, 7 May 2023 13:28:28 +0200
|
||||
Subject: [PATCH 1/1] Simplify setup
|
||||
|
||||
---
|
||||
setup.py | 15 ---------------
|
||||
1 file changed, 15 deletions(-)
|
||||
setup.py | 16 ----------------
|
||||
1 file changed, 16 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 1de4f3a..de629bd 100644
|
||||
index 9f7b685..d642737 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -18,25 +18,12 @@ __author__ = 'seanfitz'
|
||||
@@ -18,26 +18,12 @@ __author__ = 'seanfitz'
|
||||
import os
|
||||
from setuptools import setup
|
||||
|
||||
|
@ -29,15 +29,16 @@ index 1de4f3a..de629bd 100644
|
|||
-
|
||||
setup(
|
||||
name="adapt-parser",
|
||||
version="0.5.1",
|
||||
version="1.0.0",
|
||||
author="Sean Fitzgerald",
|
||||
author_email="sean@fitzgeralds.me",
|
||||
description=("A text-to-intent parsing framework."),
|
||||
- long_description=long_description,
|
||||
long_description_content_type="text/markdown",
|
||||
- long_description_content_type="text/markdown",
|
||||
license=("Apache License 2.0"),
|
||||
keywords="natural language processing",
|
||||
@@ -54,6 +41,4 @@ setup(
|
||||
url="https://github.com/MycroftAI/adapt",
|
||||
@@ -55,6 +41,4 @@ setup(
|
||||
'Programming Language :: Python :: 3.8',
|
||||
'Programming Language :: Python :: 3.9',
|
||||
],
|
||||
|
@ -45,5 +46,5 @@ index 1de4f3a..de629bd 100644
|
|||
- install_requires=required('requirements.txt')
|
||||
)
|
||||
--
|
||||
2.20.1
|
||||
2.34.1
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
# md5, sha256 from https://pypi.org/pypi/adapt-parser/json
|
||||
sha256 fdc73b34ffd94697c9b37be504585d6ae5f6eef665eb02eb86427d2080ea22f7 adapt-parser-0.5.1.tar.gz
|
||||
sha256 fb9a072e01ce4d2a2eaab791db4159144af1cfeebdec931db0b60ec2f471fd59 adapt-parser-1.0.0.tar.gz
|
||||
|
|
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_ADAPT_PARSER_VERSION = 0.5.1
|
||||
PYTHON_ADAPT_PARSER_VERSION = 1.0.0
|
||||
PYTHON_ADAPT_PARSER_SOURCE = adapt-parser-$(PYTHON_ADAPT_PARSER_VERSION).tar.gz
|
||||
PYTHON_ADAPT_PARSER_SITE = https://files.pythonhosted.org/packages/ea/f3/d1043da5dfe5b3cc5c02b0a62425d8d7231a43214ddbb6f20459b6be491c
|
||||
PYTHON_ADAPT_PARSER_SITE = https://files.pythonhosted.org/packages/ff/97/236a8cf280b789a86a7e5b50d3602e189ecc9726ebbb5b3259bb43761b02
|
||||
PYTHON_ADAPT_PARSER_SETUP_TYPE = setuptools
|
||||
|
||||
$(eval $(python-package))
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
# md5, sha256 from https://pypi.org/pypi/
|
||||
sha256 e7f2c825ac101c0953812e0f4c617ca48bd9dd5f4ebf450f7ce9086ed8f5a1fe astral-1.4.zip
|
||||
sha256 9b7c3b412e9e69d172cfb24be0e6addcc9f1bd01a28db8bebe66d75ccc533d88 astral-3.2.tar.gz
|
||||
|
|
|
@ -4,18 +4,12 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_ASTRAL_VERSION = 1.4
|
||||
PYTHON_ASTRAL_SOURCE = astral-$(PYTHON_ASTRAL_VERSION).zip
|
||||
PYTHON_ASTRAL_SITE = https://files.pythonhosted.org/packages/a4/d6/c309f266677372964c6002a56a7bec2a90875338a71325e20b24d6d1e187
|
||||
PYTHON_ASTRAL_VERSION = 3.2
|
||||
PYTHON_ASTRAL_SOURCE = astral-$(PYTHON_ASTRAL_VERSION).tar.gz
|
||||
PYTHON_ASTRAL_SITE = https://files.pythonhosted.org/packages/04/d1/1adbf06a38dc339e41a1666f6c7135924594c20fd46e060fb263248c564d
|
||||
PYTHON_ASTRAL_DEPENDENCIES = host-python-pytz
|
||||
PYTHON_ASTRAL_SETUP_TYPE = setuptools
|
||||
PYTHON_ASTRAL_LICENSE = Apache-2.0
|
||||
PYTHON_ASTRAL_LICENSE_FILES = LICENSE
|
||||
|
||||
define PYTHON_ASTRAL_EXTRACT_CMDS
|
||||
$(UNZIP) -d $(@D) $(DL_DIR)/python-astral/$(PYTHON_ASTRAL_SOURCE)
|
||||
mv $(@D)/astral-$(PYTHON_ASTRAL_VERSION)/* $(@D)
|
||||
$(RM) -r $(@D)/astral-$(PYTHON_ASTRAL_VERSION)
|
||||
endef
|
||||
|
||||
$(eval $(python-package))
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
From d7c84534b1317e2d70a98ffa3d0dd3e10a03b513 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Sun, 7 May 2023 14:08:14 +0200
|
||||
Subject: [PATCH 1/1] Loosen requirements
|
||||
|
||||
---
|
||||
pyproject.toml | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index bf9515f..c415353 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -20,10 +20,10 @@ homepage = "https://github.com/thebigmunch/audio-metadata"
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.6"
|
||||
|
||||
-attrs = ">=18.2,<19.4"
|
||||
+attrs = ">=18.2"
|
||||
bidict = "0.*"
|
||||
bitstruct = ">=6.0,<9.0"
|
||||
-more-itertools = ">=4.0,<9.0"
|
||||
+more-itertools = ">=4.0"
|
||||
pendulum = ">=2.0,<=3.0,!=2.0.5,!=2.1.0" # Work around https://github.com/sdispater/pendulum/issues/454
|
||||
pprintpp = "0.*"
|
||||
tbm-utils = "^2.3"
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
# md5, sha256 from https://pypi.org/pypi/combo_lock/json
|
||||
sha256 17605bbf3f95a461e042952dcf577d4a28d25b64a10d3da224e45554736af4fc combo_lock-0.2.1.tar.gz
|
||||
sha256 fd72d49146280ab612679a59b333b68c0b010253e2bf8fdbabda9cb790d60ec8 combo_lock-0.2.5.tar.gz
|
||||
|
|
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_COMBO_LOCK_VERSION = 0.2.1
|
||||
PYTHON_COMBO_LOCK_VERSION = 0.2.5
|
||||
PYTHON_COMBO_LOCK_SOURCE = combo_lock-$(PYTHON_COMBO_LOCK_VERSION).tar.gz
|
||||
PYTHON_COMBO_LOCK_SITE = https://files.pythonhosted.org/packages/6f/a4/2721af17a3649b6716410e9f6ee80dfcc296f17d762a35659e4655a017f6
|
||||
PYTHON_COMBO_LOCK_SITE = https://files.pythonhosted.org/packages/1a/7d/22bc221fd33a0f72c84ff8c6f6b5f06533825c058fe29a57d12467344cb3
|
||||
PYTHON_COMBO_LOCK_SETUP_TYPE = setuptools
|
||||
PYTHON_COMBO_LOCK_LICENSE = apache-2.0
|
||||
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
config BR2_PACKAGE_PYTHON_MYCROFT_MESSAGEBUS_CLIENT
|
||||
bool "python-mycroft-messagebus-client"
|
||||
help
|
||||
This module is a simple interface for the mycroft
|
||||
messagebus and can be used to connect to mycroft,
|
||||
send messages and react to messages sent by the
|
||||
Mycroft system.
|
||||
|
||||
https://github.com/MycroftAI/mycroft-messagebus-client
|
|
@ -1,2 +0,0 @@
|
|||
# Locally computed sha256 checksums
|
||||
sha256 bbb8e94b3b8dbcee5f680b94bf830e00cdfba0f54b98bbb9383a0a2e56686546 mycroft-messagebus-client-0.9.6.tar.gz
|
|
@ -1,14 +0,0 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-mycroft-messagebus-client
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_MYCROFT_MESSAGEBUS_CLIENT_VERSION = 0.9.6
|
||||
PYTHON_MYCROFT_MESSAGEBUS_CLIENT_SOURCE = mycroft-messagebus-client-$(PYTHON_MYCROFT_MESSAGEBUS_CLIENT_VERSION).tar.gz
|
||||
PYTHON_MYCROFT_MESSAGEBUS_CLIENT_SITE = https://files.pythonhosted.org/packages/66/d5/32d3db4095b63f9284ed4689c3dbdfa43c5ae02e6895167b3e34161941f5
|
||||
PYTHON_MYCROFT_MESSAGEBUS_CLIENT_SETUP_TYPE = setuptools
|
||||
PYTHON_MYCROFT_MESSAGEBUS_CLIENT_LICENSE = Apache-2.0
|
||||
PYTHON_MYCROFT_MESSAGEBUS_CLIENT_LICENSE_FILES = LICENSE
|
||||
|
||||
$(eval $(python-package))
|
|
@ -0,0 +1,8 @@
|
|||
config BR2_PACKAGE_PYTHON_OVOS_AUDIO
|
||||
bool "python-ovos-audio"
|
||||
help
|
||||
The "mouth" of the OVOS assistant!
|
||||
|
||||
Handles TTS generation and audio playback
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos-audio
|
|
@ -0,0 +1 @@
|
|||
sha256 1d639c8a5b1ddb6ea299f4e0d4521c23db5062945d93ad1f3f18c520273fe20b python-ovos-audio-3805078c09e46e8827e4eab93e1c943e5599a3e4.tar.gz
|
|
@ -0,0 +1,13 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-ovos-audio
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_AUDIO_VERSION = 3805078c09e46e8827e4eab93e1c943e5599a3e4
|
||||
PYTHON_OVOS_AUDIO_SITE = $(call github,OpenVoiceOS,ovos-audio,$(PYTHON_OVOS_AUDIO_VERSION))
|
||||
PYTHON_OVOS_AUDIO_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_AUDIO_LICENSE_FILES = LICENSE
|
||||
PYTHON_OVOS_AUDIO_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
|
@ -1 +1 @@
|
|||
sha256 c80c14a60bafe53aa2d0e4324014d3182718aa9758885692c80d193e88fe3863 python-ovos-backend-client-001c9be68b0d3f8e3d6b4420152f4627f32db7b8.tar.gz
|
||||
sha256 a887175c5bbfc1a676a331ee5abb5fa1df86a46427571ec2c821756fae00d049 python-ovos-backend-client-f3427eefa45144439317ff21ba7e912a7d7e77c4.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_BACKEND_CLIENT_VERSION = 001c9be68b0d3f8e3d6b4420152f4627f32db7b8
|
||||
PYTHON_OVOS_BACKEND_CLIENT_VERSION = f3427eefa45144439317ff21ba7e912a7d7e77c4
|
||||
PYTHON_OVOS_BACKEND_CLIENT_SITE = $(call github,OpenVoiceOS,ovos-backend-client,$(PYTHON_OVOS_BACKEND_CLIENT_VERSION))
|
||||
PYTHON_OVOS_BACKEND_CLIENT_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_BACKEND_CLIENT_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
From 1e6814f08646bf3191b26f208b017ca760be7f0f Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Sun, 7 May 2023 17:24:10 +0200
|
||||
Subject: [PATCH 1/1] Loosen requirements
|
||||
|
||||
---
|
||||
requirements.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index 6982818..09b7e69 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
ovos-config >= 0.0.8, < 0.1.0
|
||||
ovos-utils >= 0.0.32, < 0.1.0
|
||||
websocket-client>=0.54.0
|
||||
-pyee>=8.1.0, < 9.0.0
|
||||
+pyee>=8.1.0
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
config BR2_PACKAGE_PYTHON_OVOS_BUS_CLIENT
|
||||
bool "python-ovos-bus-client"
|
||||
help
|
||||
This module is a simple interface for the mycroft
|
||||
messagebus and can be used to connect to ovos, send
|
||||
messages and react to messages sent by the OpenVoiceOS
|
||||
system.
|
||||
|
||||
This module extends the mycroft-messagebus-client with
|
||||
a Session implementation
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos-bus-client
|
|
@ -0,0 +1,2 @@
|
|||
# Locally computed sha256 checksums
|
||||
sha256 c8150ffcd690914954f90309f167eff9f59accba4a75acb367a84022768f800e python-ovos-bus-client-8821ec701b061eff7821c9f3cd1f9d4e60153dbd.tar.gz
|
|
@ -0,0 +1,14 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-ovos-bus-client
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_BUS_CLIENT_VERSION = 8821ec701b061eff7821c9f3cd1f9d4e60153dbd
|
||||
PYTHON_OVOS_BUS_CLIENT_SITE = $(call github,OpenVoiceOS,ovos-bus-client,$(PYTHON_OVOS_BUS_CLIENT_VERSION))
|
||||
PYTHON_OVOS_BUS_CLIENT_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_BUS_CLIENT_LICENSE = Apache-2.0
|
||||
PYTHON_OVOS_BUS_CLIENT_LICENSE_FILES = LICENSE
|
||||
PYTHON_OVOS_BUS_CLIENT_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
|
@ -0,0 +1,18 @@
|
|||
config BR2_PACKAGE_PYTHON_OVOS_CLASSIFIERS
|
||||
bool "python-ovos-classifiers"
|
||||
help
|
||||
provide baseline feature extraction pipelines suited for each task
|
||||
|
||||
provide user facing classes for each NLP task needed in the OVOS ecosystem
|
||||
transparently load different models (model_path or external plugin)
|
||||
|
||||
provide dataset loaders suited for each of those tasks per language
|
||||
|
||||
provide baseline heuristic implementation for each task per language
|
||||
replaces ovos-lingua-franca
|
||||
|
||||
provide baseline implementations and benchmarks using classical nltk and
|
||||
scikit-learn algorithms
|
||||
minimum viable implementation to ensure lang support
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos-core
|
|
@ -0,0 +1 @@
|
|||
sha256 f1c9c40f35c83e73eac934567dda2e1fe635e3ef9727b6248e4440cd61e872e8 python-ovos-classifiers-67ac7258aa933250d16761995ab439b27d28d2d3.tar.gz
|
|
@ -0,0 +1,13 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-ovos-classifiers
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_CLASSIFIERS_VERSION = 67ac7258aa933250d16761995ab439b27d28d2d3
|
||||
PYTHON_OVOS_CLASSIFIERS_SITE = $(call github,OpenVoiceOS,ovos-classifiers,$(PYTHON_OVOS_CLASSIFIERS_VERSION))
|
||||
PYTHON_OVOS_CLASSIFIERS_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_CLASSIFIERS_LICENSE_FILES = LICENSE
|
||||
PYTHON_OVOS_CLASSIFIERS_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
|
@ -1 +1 @@
|
|||
sha256 4964984d873abcbe9000f21bb9c55b8900887edb0e87e564bddd95988098f22a python-ovos-config-214b31970ae42b7eb65fe8ecc721ac3126e7cbce.tar.gz
|
||||
sha256 08dbbbf53aaeb3ab3117636c00ac692605a31edbd50767efc5ccaf6e986f31c8 python-ovos-config-7df52cac6cbe369de43b06abb64e46cc83a29b7e.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_CONFIG_VERSION = 214b31970ae42b7eb65fe8ecc721ac3126e7cbce
|
||||
PYTHON_OVOS_CONFIG_VERSION = 7df52cac6cbe369de43b06abb64e46cc83a29b7e
|
||||
PYTHON_OVOS_CONFIG_SITE = $(call github,OpenVoiceOS,ovos-config,$(PYTHON_OVOS_CONFIG_VERSION))
|
||||
PYTHON_OVOS_CONFIG_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_CONFIG_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -1 +1 @@
|
|||
sha256 c44028f1bd288dc1a93cff1edc2b8f6c15fd3b48c110edb4f8d227b343e00449 python-ovos-core-8e54d544c40d4e4a227d886bdac933b0498cc7d2.tar.gz
|
||||
sha256 9f4d96d6f159ead174d98b0ef1eae337004114b0935ad3ea6333cf0451a33df7 python-ovos-core-79185d366fd3ad89a0a9d7f180ec5f6ec1f3d4b7.tar.gz
|
||||
|
|
|
@ -4,16 +4,10 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_CORE_VERSION = 8e54d544c40d4e4a227d886bdac933b0498cc7d2
|
||||
PYTHON_OVOS_CORE_VERSION = 79185d366fd3ad89a0a9d7f180ec5f6ec1f3d4b7
|
||||
PYTHON_OVOS_CORE_SITE = $(call github,OpenVoiceOS,ovos-core,$(PYTHON_OVOS_CORE_VERSION))
|
||||
PYTHON_OVOS_CORE_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_CORE_LICENSE_FILES = LICENSE
|
||||
PYTHON_OVOS_CORE_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
PYTHON_OVOS_CORE_PRE_CONFIGURE_HOOKS = PYTHON_OVOS_CORE_REQUIREMENTS
|
||||
|
||||
define PYTHON_OVOS_CORE_REQUIREMENTS
|
||||
cp $(@D)/requirements/requirements.txt $(@D)/requirements/minimal.txt
|
||||
endef
|
||||
|
||||
$(eval $(python-package))
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
config BR2_PACKAGE_PYTHON_OVOS_GUI
|
||||
bool "python-ovos-gui"
|
||||
help
|
||||
GUI messagebus service, manages GUI state
|
||||
and implements the gui protocol
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos-gui
|
|
@ -0,0 +1 @@
|
|||
sha256 09488c55a2617bf3d2807a84c4f2a8f636ce1b8a547a0ce5c685bba3f8742e96 python-ovos-gui-502dec01d0055c54998280ffaa76d5f54961173f.tar.gz
|
|
@ -0,0 +1,13 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-ovos-gui
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_GUI_VERSION = 502dec01d0055c54998280ffaa76d5f54961173f
|
||||
PYTHON_OVOS_GUI_SITE = $(call github,OpenVoiceOS,ovos-gui,$(PYTHON_OVOS_GUI_VERSION))
|
||||
PYTHON_OVOS_GUI_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_GUI_LICENSE_FILES = LICENSE
|
||||
PYTHON_OVOS_GUI_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
|
@ -1,61 +0,0 @@
|
|||
From 0917fee8cef66042341bfdf569167e650ba3fe23 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Sun, 1 Jan 2023 14:40:31 +0100
|
||||
Subject: [PATCH 1/1] Changes to setup
|
||||
|
||||
---
|
||||
setup.py | 19 ++++---------------
|
||||
1 file changed, 4 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index dc17012..cd7ca9d 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1,22 +1,10 @@
|
||||
import os
|
||||
-from distutils.command.install import install
|
||||
|
||||
-import pip
|
||||
from setuptools import setup
|
||||
|
||||
BASEDIR = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
|
||||
-class CustomInstall(install):
|
||||
- """Custom handler for the 'install' command."""
|
||||
-
|
||||
- def run(self):
|
||||
- # uninstall lingua_franca
|
||||
- # the whole purpose of this package is to replace it
|
||||
- pip.main(["uninstall", "lingua_franca", "-y"])
|
||||
- super().run()
|
||||
-
|
||||
-
|
||||
def package_files(directory):
|
||||
paths = []
|
||||
for (path, directories, filenames) in os.walk(directory):
|
||||
@@ -27,9 +15,11 @@ def package_files(directory):
|
||||
|
||||
def required(requirements_file):
|
||||
""" Read requirements file and remove comments and empty lines. """
|
||||
- with open(os.path.join(os.path.dirname(__file__), requirements_file),
|
||||
- 'r') as f:
|
||||
+ with open(os.path.join(BASEDIR, requirements_file), 'r') as f:
|
||||
requirements = f.read().splitlines()
|
||||
+ if 'MYCROFT_LOOSE_REQUIREMENTS' in os.environ:
|
||||
+ print('USING LOOSE REQUIREMENTS!')
|
||||
+ requirements = [r.replace('==', '>=').replace('~=', '>=') for r in requirements]
|
||||
return [pkg for pkg in requirements
|
||||
if pkg.strip() and not pkg.startswith("#")]
|
||||
|
||||
@@ -68,7 +58,6 @@ setup(
|
||||
name='ovos-lingua-franca',
|
||||
version=get_version(),
|
||||
packages=['lingua_franca', 'lingua_franca.lang', 'lingua_franca.util'],
|
||||
- cmdclass={'install': CustomInstall},
|
||||
url='https://github.com/OpenVoiceOS/ovos-lingua-franca',
|
||||
license='Apache2.0',
|
||||
package_data={'': extra_files},
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1 +1 @@
|
|||
sha256 5589cc5cca4336da0fe222b8c1279355aa43d86e6a3283991b2c93fa667eb7e6 python-ovos-lingua-franca-86a8f117ce7ca56a9ccf9cea27bcd5e63a7b54c8.tar.gz
|
||||
sha256 1511291c17d5747ce78468f5e05c6e6fa4c41dd68ee5e08507047c54cce5138c python-ovos-lingua-franca-0c4ead9b3ad396fc68a5b5c6465678b567c6c01f.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_LINGUA_FRANCA_VERSION = 86a8f117ce7ca56a9ccf9cea27bcd5e63a7b54c8
|
||||
PYTHON_OVOS_LINGUA_FRANCA_VERSION = 0c4ead9b3ad396fc68a5b5c6465678b567c6c01f
|
||||
PYTHON_OVOS_LINGUA_FRANCA_SITE = $(call github,OpenVoiceOS,ovos-lingua-franca,$(PYTHON_OVOS_LINGUA_FRANCA_VERSION))
|
||||
PYTHON_OVOS_LINGUA_FRANCA_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_LINGUA_FRANCA_LICENSE = Apache-2.0
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
config BR2_PACKAGE_PYTHON_OVOS_LISTENER
|
||||
bool "python-ovos-listener"
|
||||
help
|
||||
The "ears" of the OVOS assistant!
|
||||
|
||||
Listens for wakewords, performs VAD and STT, the
|
||||
final transcribed speech is then sent to ovos-core
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos-listener
|
|
@ -0,0 +1 @@
|
|||
sha256 ae7041f65321dd3c0583610ce21f5952cfa474652592372b301c9d1c21e20bec python-ovos-listener-768cd42d50ff7439c359d07a2dbba085a1e8b657.tar.gz
|
|
@ -0,0 +1,13 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-ovos-listener
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_LISTENER_VERSION = 768cd42d50ff7439c359d07a2dbba085a1e8b657
|
||||
PYTHON_OVOS_LISTENER_SITE = $(call github,OpenVoiceOS,ovos-listener,$(PYTHON_OVOS_LISTENER_VERSION))
|
||||
PYTHON_OVOS_LISTENER_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_LISTENER_LICENSE_FILES = LICENSE
|
||||
PYTHON_OVOS_LISTENER_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
|
@ -0,0 +1,6 @@
|
|||
config BR2_PACKAGE_PYTHON_OVOS_MESSAGEBUS
|
||||
bool "python-ovos-messagebus"
|
||||
help
|
||||
messagebus service, the nervous system of OpenVoiceOS
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos-messagebus
|
|
@ -0,0 +1 @@
|
|||
sha256 49256ffac0fa8606f36b9ef099be89c408878b8b291e190fa008e7c1e387ef58 python-ovos-messagebus-034ef0b14aeab33152fc97b3fea0e445051a828a.tar.gz
|
|
@ -0,0 +1,13 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-ovos-core
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_MESSAGEBUS_VERSION = 034ef0b14aeab33152fc97b3fea0e445051a828a
|
||||
PYTHON_OVOS_MESSAGEBUS_SITE = $(call github,OpenVoiceOS,ovos-messagebus,$(PYTHON_OVOS_MESSAGEBUS_VERSION))
|
||||
PYTHON_OVOS_MESSAGEBUS_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_MESSAGEBUS_LICENSE_FILES = LICENSE
|
||||
PYTHON_OVOS_MESSAGEBUS_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
File diff suppressed because it is too large
Load Diff
|
@ -1 +1 @@
|
|||
sha256 929d93df5e48849f4188f0cf48e2a369801434d7190abf8f9135029bb2282982 python-ovos-ocp-audio-plugin-83bb8590870b9ea9cc30316f7baff1a16ac38574.tar.gz
|
||||
sha256 d5f695b5d6533fb51d81b5c11e2a6731341d1d8d9f4933713905b81d99bf64a5 python-ovos-ocp-audio-plugin-31701ded43a4f7ff6c02833d6aaf1bc0740257fc.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_OCP_AUDIO_PLUGIN_VERSION = 83bb8590870b9ea9cc30316f7baff1a16ac38574
|
||||
PYTHON_OVOS_OCP_AUDIO_PLUGIN_VERSION = 31701ded43a4f7ff6c02833d6aaf1bc0740257fc
|
||||
PYTHON_OVOS_OCP_AUDIO_PLUGIN_SITE = $(call github,OpenVoiceOS,ovos-ocp-audio-plugin,$(PYTHON_OVOS_OCP_AUDIO_PLUGIN_VERSION))
|
||||
PYTHON_OVOS_OCP_AUDIO_PLUGIN_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_OCP_AUDIO_PLUGIN_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
From 14ed8a6e2b434c88b5449af31abdd06fbeeb8a2e Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Sun, 7 May 2023 15:18:00 +0200
|
||||
Subject: [PATCH 1/1] Loosen requirements
|
||||
|
||||
---
|
||||
requirements.txt | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index d3d39d4..cebb676 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
attrs>=18.2
|
||||
bidict~=0.0
|
||||
-bitstruct>=6.0,<9.0
|
||||
-more-itertools>=4.0,<9.0
|
||||
+bitstruct>=6.0
|
||||
+more-itertools>=4.0
|
||||
pprintpp~=0.0
|
||||
-wrapt
|
||||
\ No newline at end of file
|
||||
+wrapt
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1 +1 @@
|
|||
sha256 f4dc7703b97e1ae4a8ec5c8fe2083e322e4ce582c6f6fd3d6ec9bb9782fc2724 python-ovos-ocp-files-plugin-145cd788eae1f3aaeb214f7a3dda91229c0c5837.tar.gz
|
||||
sha256 ef4ee635d57477d03e9e36bd1f23eda69bee60730149d34d24bd370e17e8e496 python-ovos-ocp-files-plugin-6a3a9426dfff9666ebb0026519a4bcaae609086b.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_OCP_FILES_PLUGIN_VERSION = 145cd788eae1f3aaeb214f7a3dda91229c0c5837
|
||||
PYTHON_OVOS_OCP_FILES_PLUGIN_VERSION = 6a3a9426dfff9666ebb0026519a4bcaae609086b
|
||||
PYTHON_OVOS_OCP_FILES_PLUGIN_SITE = $(call github,OpenVoiceOS,ovos-ocp-files-plugin,$(PYTHON_OVOS_OCP_FILES_PLUGIN_VERSION))
|
||||
PYTHON_OVOS_OCP_FILES_PLUGIN_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_OCP_FILES_PLUGIN_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -1 +1 @@
|
|||
sha256 88d6e2ab87b41e60f87e2dd1f23e45cecf44c6500a71a195b2f39596fe559f7c python-ovos-phal-plugin-wifi-setup-9464e7d45edfe076881237bc6666fe0ea015d727.tar.gz
|
||||
sha256 3869dfb36c9a76118f6824b7c28a667d0ef4672aba046bf4b1e928bd88200b42 python-ovos-phal-plugin-wifi-setup-1ef9c2b01e25690c6d6f515830e5c45b038ab3fe.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_VERSION = 9464e7d45edfe076881237bc6666fe0ea015d727
|
||||
PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_VERSION = 1ef9c2b01e25690c6d6f515830e5c45b038ab3fe
|
||||
PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_SITE = $(call github,OpenVoiceOS,ovos-PHAL-plugin-wifi-setup,$(PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_VERSION))
|
||||
PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -1 +1 @@
|
|||
sha256 154bc420b874445f3725b07ce90857a800b6057c03e8dfd21bddb9fc9b9b2fe0 python-ovos-plugin-manager-1012f3fa2524513126b842bdb645409f5ed288be.tar.gz
|
||||
sha256 2b45a8efe1c419bd733ddb848fae09bed5ad1825b5ec790addb1a7f71c70fb88 python-ovos-plugin-manager-c27ca48030511d172c1d7ba980ed4fef0a8006c9.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_PLUGIN_MANAGER_VERSION = 1012f3fa2524513126b842bdb645409f5ed288be
|
||||
PYTHON_OVOS_PLUGIN_MANAGER_VERSION = c27ca48030511d172c1d7ba980ed4fef0a8006c9
|
||||
PYTHON_OVOS_PLUGIN_MANAGER_SITE = $(call github,OpenVoiceOS,OVOS-plugin-manager,$(PYTHON_OVOS_PLUGIN_MANAGER_VERSION))
|
||||
PYTHON_OVOS_PLUGIN_MANAGER_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_PLUGIN_MANAGER_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
config BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_SERVER
|
||||
bool "python-ovos-stt-plugin-server"
|
||||
help
|
||||
OpenVoiceOS companion plugin for OpenVoiceOS STT Server
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos-stt-plugin-server
|
|
@ -0,0 +1,2 @@
|
|||
# sha256 locally computed
|
||||
sha256 e722f87a3e1b5c7ae89d690f9e924122fdaedb6aa4bf1e7470ce64b756ed33d0 python-ovos-stt-plugin-server-8f440da949ced2f823383b87acb7c7e502cdb7ff.tar.gz
|
|
@ -0,0 +1,12 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-ovos-stt-plugin-server
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_STT_PLUGIN_SERVER_VERSION = 8f440da949ced2f823383b87acb7c7e502cdb7ff
|
||||
PYTHON_OVOS_STT_PLUGIN_SERVER_SITE = $(call github,OpenVoiceOS,ovos-stt-plugin-server,$(PYTHON_OVOS_STT_PLUGIN_SERVER_VERSION))
|
||||
PYTHON_OVOS_STT_PLUGIN_SERVER_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_STT_PLUGIN_SERVER_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
|
@ -1,6 +0,0 @@
|
|||
config BR2_PACKAGE_PYTHON_OVOS_STT_SERVER_PLUGIN
|
||||
bool "python-ovos-stt-server-plugin"
|
||||
help
|
||||
OpenVoiceOS companion plugin for OpenVoiceOS STT Server
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos-stt-server-plugin
|
|
@ -1,2 +0,0 @@
|
|||
# sha256 locally computed
|
||||
sha256 4a5136c3fe8ad6524f3bcbbf87f08f1369ceade243972e1c942294e007dc1370 python-ovos-stt-server-plugin-c8d7dea5a6875221f152828629846979f52e6d05.tar.gz
|
|
@ -1,12 +0,0 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-ovos-stt-server-plugin
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_STT_SERVER_PLUGIN_VERSION = c8d7dea5a6875221f152828629846979f52e6d05
|
||||
PYTHON_OVOS_STT_SERVER_PLUGIN_SITE = $(call github,OpenVoiceOS,ovos-stt-server-plugin,$(PYTHON_OVOS_STT_SERVER_PLUGIN_VERSION))
|
||||
PYTHON_OVOS_STT_SERVER_PLUGIN_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_STT_SERVER_PLUGIN_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
|
@ -1,164 +0,0 @@
|
|||
From 99594333cb51091f27013cb4cf8b5b5c3177c4aa Mon Sep 17 00:00:00 2001
|
||||
From: jarbasai <jarbasai@mailfence.com>
|
||||
Date: Sat, 10 Dec 2022 15:52:32 +0000
|
||||
Subject: [PATCH 1/2] improve network checks
|
||||
|
||||
---
|
||||
ovos_utils/network_utils.py | 71 ++++++++++++++++++++++++++++++++++---
|
||||
1 file changed, 66 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/ovos_utils/network_utils.py b/ovos_utils/network_utils.py
|
||||
index c7d21c2..4d75e2f 100644
|
||||
--- a/ovos_utils/network_utils.py
|
||||
+++ b/ovos_utils/network_utils.py
|
||||
@@ -1,6 +1,25 @@
|
||||
import socket
|
||||
+
|
||||
import requests
|
||||
|
||||
+from ovos_utils.log import LOG
|
||||
+
|
||||
+
|
||||
+def get_network_tests_config():
|
||||
+ """Get network_tests object from mycroft.configuration."""
|
||||
+ from ovos_config import Configuration
|
||||
+ config = Configuration()
|
||||
+ return config.get(
|
||||
+ "network_tests",
|
||||
+ {
|
||||
+ "ip_url": 'https://api.ipify.org',
|
||||
+ "dns_primary": "1.1.1.1",
|
||||
+ "dns_secondary": "8.8.8.8",
|
||||
+ "web_url": "https://nmcheck.gnome.org/check_network_status.txt",
|
||||
+ "web_url_secondary": "https://checkonline.home-assistant.io/online.txt"
|
||||
+ }
|
||||
+ )
|
||||
+
|
||||
|
||||
def get_ip():
|
||||
# taken from https://stackoverflow.com/a/28950776/13703283
|
||||
@@ -17,27 +36,69 @@ def get_ip():
|
||||
|
||||
|
||||
def get_external_ip():
|
||||
- return requests.get('https://api.ipify.org').text
|
||||
+ cfg = get_network_tests_config()
|
||||
+ return requests.get(cfg["ip_url"]).text
|
||||
|
||||
|
||||
-def is_connected_dns(host="1.1.1.1"):
|
||||
+def is_connected_dns(host=None, port=53, timeout=3):
|
||||
+ """Check internet connection by connecting to DNS servers
|
||||
+ Returns:
|
||||
+ True if internet connection can be detected
|
||||
+ """
|
||||
+
|
||||
+ if host is None:
|
||||
+ cfg = get_network_tests_config()
|
||||
+ return is_connected_dns(cfg["dns_primary"]) or \
|
||||
+ is_connected_dns(cfg["dns_secondary"])
|
||||
+
|
||||
try:
|
||||
# connect to the host -- tells us if the host is actually reachable
|
||||
- socket.create_connection((host, 53))
|
||||
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
+ s.settimeout(timeout)
|
||||
+ s.connect((host, port))
|
||||
return True
|
||||
except OSError:
|
||||
pass
|
||||
return False
|
||||
|
||||
|
||||
-def is_connected_http(host="http://duckduckgo.com"):
|
||||
+def is_connected_http(host=None):
|
||||
+ """Check internet connection by connecting to some website
|
||||
+ Returns:
|
||||
+ True if connection attempt succeeded
|
||||
+ """
|
||||
+ if host is None:
|
||||
+ cfg = get_network_tests_config()
|
||||
+ return is_connected_http(cfg["web_url"]) or \
|
||||
+ is_connected_http(cfg["web_url_secondary"])
|
||||
+
|
||||
try:
|
||||
status = requests.head(host).status_code
|
||||
return True
|
||||
- except OSError:
|
||||
+ except:
|
||||
pass
|
||||
return False
|
||||
|
||||
|
||||
def is_connected():
|
||||
return any((is_connected_dns(), is_connected_http()))
|
||||
+
|
||||
+
|
||||
+def check_captive_portal(url="http://start.mycroft.ai/portal-check.html",
|
||||
+ expected_text="<title>Portal Check</title>") -> bool:
|
||||
+ """Returns True if a captive portal page is detected"""
|
||||
+ captive_portal = False
|
||||
+
|
||||
+ try:
|
||||
+ # We need to check a site that doesn't use HTTPS
|
||||
+ html_doc = requests.get(url).text
|
||||
+
|
||||
+ # If something different is in the html, we likely were redirected
|
||||
+ # to the portal page.
|
||||
+ if expected_text not in html_doc:
|
||||
+ captive_portal = True
|
||||
+ except Exception:
|
||||
+ LOG.exception("Error checking for captive portal")
|
||||
+
|
||||
+ return captive_portal
|
||||
+
|
||||
|
||||
From a9ccc2d015752959c67a5be29053bd3097380cff Mon Sep 17 00:00:00 2001
|
||||
From: jarbasai <jarbasai@mailfence.com>
|
||||
Date: Sat, 10 Dec 2022 16:25:48 +0000
|
||||
Subject: [PATCH 2/2] portal check
|
||||
|
||||
---
|
||||
ovos_utils/network_utils.py | 17 +++++++++++------
|
||||
1 file changed, 11 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/ovos_utils/network_utils.py b/ovos_utils/network_utils.py
|
||||
index 4d75e2f..d980103 100644
|
||||
--- a/ovos_utils/network_utils.py
|
||||
+++ b/ovos_utils/network_utils.py
|
||||
@@ -15,8 +15,10 @@ def get_network_tests_config():
|
||||
"ip_url": 'https://api.ipify.org',
|
||||
"dns_primary": "1.1.1.1",
|
||||
"dns_secondary": "8.8.8.8",
|
||||
- "web_url": "https://nmcheck.gnome.org/check_network_status.txt",
|
||||
- "web_url_secondary": "https://checkonline.home-assistant.io/online.txt"
|
||||
+ "web_url": "http://nmcheck.gnome.org/check_network_status.txt",
|
||||
+ "web_url_secondary": "https://checkonline.home-assistant.io/online.txt",
|
||||
+ "captive_portal_url": "http://nmcheck.gnome.org/check_network_status.txt",
|
||||
+ "captive_portal_text": "NetworkManager is online"
|
||||
}
|
||||
)
|
||||
|
||||
@@ -84,15 +86,18 @@ def is_connected():
|
||||
return any((is_connected_dns(), is_connected_http()))
|
||||
|
||||
|
||||
-def check_captive_portal(url="http://start.mycroft.ai/portal-check.html",
|
||||
- expected_text="<title>Portal Check</title>") -> bool:
|
||||
+def check_captive_portal(host=None, expected_text=None) -> bool:
|
||||
"""Returns True if a captive portal page is detected"""
|
||||
captive_portal = False
|
||||
|
||||
+ if not host or not expected_text:
|
||||
+ cfg = get_network_tests_config()
|
||||
+ host = host or cfg["captive_portal_url"]
|
||||
+ expected_text = expected_text or cfg["captive_portal_url_text"]
|
||||
+
|
||||
try:
|
||||
# We need to check a site that doesn't use HTTPS
|
||||
- html_doc = requests.get(url).text
|
||||
-
|
||||
+ html_doc = requests.get(host).text
|
||||
# If something different is in the html, we likely were redirected
|
||||
# to the portal page.
|
||||
if expected_text not in html_doc:
|
|
@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_OVOS_UTILS
|
|||
collection of simple utilities for use
|
||||
across the mycroft ecosystem
|
||||
|
||||
https://github.com/OpenVoiceOS/ovos_utils
|
||||
https://github.com/OpenVoiceOS/ovos-utils
|
||||
|
|
|
@ -1 +1 @@
|
|||
sha256 a1ece6a14b2f086ba0e025e850585201572cddbae0c7fe965f23af13da24bb63 python-ovos-utils-2421af7b156a83e620900a50ef058602233eb08d.tar.gz
|
||||
sha256 fae11d62272132489c8170210c8abf70437faaf0b586875f735f916dc69d6e73 python-ovos-utils-9586b18e4e3a00e8f079d6afd4ca8c859d9c549e.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_UTILS_VERSION = 2421af7b156a83e620900a50ef058602233eb08d
|
||||
PYTHON_OVOS_UTILS_VERSION = 9586b18e4e3a00e8f079d6afd4ca8c859d9c549e
|
||||
PYTHON_OVOS_UTILS_SITE = $(call github,OpenVoiceOS,ovos_utils,$(PYTHON_OVOS_UTILS_VERSION))
|
||||
PYTHON_OVOS_UTILS_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_UTILS_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -1 +1 @@
|
|||
sha256 064545e9d7026f151f2f330235f5842eb4fd2b761f0689a4219dba2b28bc6b59 python-ovos-workshop-cc29b213c88c934f5fb17c3dadda007b6ed372bb.tar.gz
|
||||
sha256 2f609ef8279528783613a661447c6f955c3dcc9388aedfd20ece8db5f0c97666 python-ovos-workshop-882319138769bff7441efa969bed637ad31b7f24.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_WORKSHOP_VERSION = cc29b213c88c934f5fb17c3dadda007b6ed372bb
|
||||
PYTHON_OVOS_WORKSHOP_VERSION = 882319138769bff7441efa969bed637ad31b7f24
|
||||
PYTHON_OVOS_WORKSHOP_SITE = $(call github,OpenVoiceOS,OVOS-workshop,$(PYTHON_OVOS_WORKSHOP_VERSION))
|
||||
PYTHON_OVOS_WORKSHOP_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_WORKSHOP_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -1 +1 @@
|
|||
sha256 32bd492b538c3d25c3c6dc7766088e9e4090f05628d3e7bc42715e32e021822d python-ovos-ww-plugin-precise-lite-a39d467ae106892edfbb547d0012706dc3127002.tar.gz
|
||||
sha256 8e314a786bbd3a0d2b139463f16a1ebe3272e195724ac4279797c9a41575c04c python-ovos-ww-plugin-precise-lite-485f1c39cbb9542c9b0885207f33df91313ed565.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE_VERSION = a39d467ae106892edfbb547d0012706dc3127002
|
||||
PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE_VERSION = 485f1c39cbb9542c9b0885207f33df91313ed565
|
||||
PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE_SITE = $(call github,OpenVoiceOS,ovos-ww-plugin-precise-lite,$(PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE_VERSION))
|
||||
PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE_SETUP_TYPE = setuptools
|
||||
PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE_LICENSE_FILES = LICENSE
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
# md5, sha256 from https://pypi.org/pypi/padacioso/json
|
||||
md5 8db1031f1822579e37f43480f7f4f8e4 padacioso-0.1.1.tar.gz
|
||||
sha256 758083d43662a78b56e5eb25086cc1f702db26bf1bb5dd38e4a7372c86ac90b4 padacioso-0.1.1.tar.gz
|
||||
# Locally computed
|
||||
sha256 519f6dbbe9d821e83164484c669ed63f471bbdf08ab0d4bde186943a794776f0 python-padacioso-8888ffe95731edafad02e9603559abd24bb363a4.tar.gz
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_PADACIOSO_VERSION = 0.1.1
|
||||
PYTHON_PADACIOSO_SOURCE = padacioso-$(PYTHON_PADACIOSO_VERSION).tar.gz
|
||||
PYTHON_PADACIOSO_SITE = https://files.pythonhosted.org/packages/7f/3d/292f14feaa17d724561d030616920e4dc4163aab13fd4e88d3071c1023a5
|
||||
PYTHON_PADACIOSO_VERSION = 8888ffe95731edafad02e9603559abd24bb363a4
|
||||
PYTHON_PADACIOSO_SITE = $(call github,OpenVoiceOS,padacioso,$(PYTHON_PADACIOSO_VERSION))
|
||||
PYTHON_PADACIOSO_SETUP_TYPE = setuptools
|
||||
PYTHON_PADACIOSO_LICENSE = apache-2.0
|
||||
PYTHON_PADACIOSO_ENV = MYCROFT_LOOSE_REQUIREMENTS=true
|
||||
|
||||
$(eval $(python-package))
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
From 070ac326d09b935b819e2300b0f4b1b5e7d81ae9 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Sun, 7 May 2023 15:58:38 +0200
|
||||
Subject: [PATCH 1/1] Fix pep517 install
|
||||
|
||||
---
|
||||
build.py => buildext.py | 0
|
||||
pyproject.toml | 2 +-
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
rename build.py => buildext.py (100%)
|
||||
|
||||
diff --git a/build.py b/buildext.py
|
||||
similarity index 100%
|
||||
rename from build.py
|
||||
rename to buildext.py
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index cadf000..36fd781 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -50,7 +50,7 @@ freezegun = "^0.3.15"
|
||||
|
||||
[tool.poetry.build]
|
||||
generate-setup-file = false
|
||||
-script = "build.py"
|
||||
+script = "buildext.py"
|
||||
|
||||
[tool.isort]
|
||||
line_length = 88
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
config BR2_PACKAGE_PYTHON_PENDULUM
|
||||
bool "python-pendulum"
|
||||
help
|
||||
Python datetimes made easy.
|
||||
|
||||
https://pypi.org/project/pendulum/
|
|
@ -0,0 +1,2 @@
|
|||
# md5, sha256 from https://pypi.org/pypi/pendulum/json
|
||||
sha256 b06a0ca1bfe41c990bbf0c029f0b6501a7f2ec4e38bfec730712015e8860f207 pendulum-2.1.2.tar.gz
|
|
@ -0,0 +1,14 @@
|
|||
################################################################################
|
||||
#
|
||||
# python-pendulum
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_PENDULUM_VERSION = 2.1.2
|
||||
PYTHON_PENDULUM_SOURCE = pendulum-$(PYTHON_PENDULUM_VERSION).tar.gz
|
||||
PYTHON_PENDULUM_SITE = https://files.pythonhosted.org/packages/db/15/6e89ae7cde7907118769ed3d2481566d05b5fd362724025198bb95faf599
|
||||
PYTHON_PENDULUM_SETUP_TYPE = setuptools
|
||||
PYTHON_PENDULUM_LICENSE = MIT
|
||||
PYTHON_PENDULUM_LICENSE_FILES = LICENSE
|
||||
|
||||
$(eval $(python-package))
|
|
@ -0,0 +1,39 @@
|
|||
From 96cb99218e4f88ed2d7159b8b68ae6e163c0d9ac Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Sun, 7 May 2023 14:22:38 +0200
|
||||
Subject: [PATCH 1/1] Loosen requirements
|
||||
|
||||
---
|
||||
pyproject.toml | 2 +-
|
||||
setup.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index f86e9c4..23bbc17 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -19,7 +19,7 @@ homepage = "https://github.com/thebigmunch/tbm-utils"
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.6"
|
||||
|
||||
-attrs = ">=18.2,<19.4"
|
||||
+attrs = ">=18.2"
|
||||
pendulum = ">=2.0,<=3.0,!=2.0.5,!=2.1.0" # Work around https://github.com/sdispater/pendulum/issues/454
|
||||
pprintpp = "0.*"
|
||||
wrapt = "^1.0"
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 9a1980e..16875cf 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -11,7 +11,7 @@ package_data = \
|
||||
{'': ['*']}
|
||||
|
||||
install_requires = \
|
||||
-['attrs>=18.2,<19.4',
|
||||
+['attrs>=18.2',
|
||||
'pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0',
|
||||
'pprintpp<1.0.0',
|
||||
'wrapt>=1.0,<2.0']
|
||||
--
|
||||
2.34.1
|
||||
|
Loading…
Reference in New Issue