From 18b87f40280cdbecc2560126b8a01c58a7920e79 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen Date: Sun, 19 Sep 2021 11:42:55 +0200 Subject: [PATCH] Bump HolmesV to latest --- ...02-Set-version-string-to-OpenVoiceOS.patch | 25 ------------------- .../0002-Simplify-requirements-setup.patch | 25 +++++++++++++++++++ .../python-holmesv/python-holmesv.hash | 2 +- .../package/python-holmesv/python-holmesv.mk | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 buildroot-external/package/python-holmesv/0002-Set-version-string-to-OpenVoiceOS.patch create mode 100644 buildroot-external/package/python-holmesv/0002-Simplify-requirements-setup.patch diff --git a/buildroot-external/package/python-holmesv/0002-Set-version-string-to-OpenVoiceOS.patch b/buildroot-external/package/python-holmesv/0002-Set-version-string-to-OpenVoiceOS.patch deleted file mode 100644 index 7fbc13ed..00000000 --- a/buildroot-external/package/python-holmesv/0002-Set-version-string-to-OpenVoiceOS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c4c24683db5eca51fd9511d6bbcbe4fca4298fa3 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Mon, 5 Jul 2021 12:54:43 +0200 -Subject: [PATCH 1/1] Set version string to OpenVoiceOS - ---- - mycroft/version/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mycroft/version/__init__.py b/mycroft/version/__init__.py -index b6ca27c8..80f0dd18 100644 ---- a/mycroft/version/__init__.py -+++ b/mycroft/version/__init__.py -@@ -39,7 +39,7 @@ CORE_VERSION_STR = '.'.join(map(str, CORE_VERSION_TUPLE)) - - HOLMES_VERSION_TUPLE = (SYNC_DATE, PATCH_VERSION) - y, m, d = str(SYNC_DATE)[:4], str(SYNC_DATE)[4:6], str(SYNC_DATE)[-2:] --HOLMES_VERSION_STR = f'{y}.{m}.{d}.a{PATCH_VERSION} (HolmesV)' -+HOLMES_VERSION_STR = f'{y}.{m}.{d}.a{PATCH_VERSION} (OpenVoiceOS)' - - - class VersionManager: --- -2.20.1 - diff --git a/buildroot-external/package/python-holmesv/0002-Simplify-requirements-setup.patch b/buildroot-external/package/python-holmesv/0002-Simplify-requirements-setup.patch new file mode 100644 index 00000000..96721e57 --- /dev/null +++ b/buildroot-external/package/python-holmesv/0002-Simplify-requirements-setup.patch @@ -0,0 +1,25 @@ +From 6f1e7187a5911811b4df48b7cc59b8c944156123 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sat, 18 Sep 2021 15:27:28 +0200 +Subject: [PATCH 1/1] Simplify requirements setup + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 71845ceb..94376622 100644 +--- a/setup.py ++++ b/setup.py +@@ -55,7 +55,7 @@ setup( + license='Apache-2.0', + url='https://github.com/HelloChatterbox/HolmesV', + description='the library to build your own voice assistant', +- install_requires=required('requirements/minimal.txt'), ++ install_requires=required('requirements/requirements.txt'), + extras_require={ + 'audio-backend': required('requirements/extra-audiobackend.txt'), + 'mark1': required('requirements/extra-mark1.txt'), +-- +2.33.0 + diff --git a/buildroot-external/package/python-holmesv/python-holmesv.hash b/buildroot-external/package/python-holmesv/python-holmesv.hash index d7c67bc3..9d2be7df 100644 --- a/buildroot-external/package/python-holmesv/python-holmesv.hash +++ b/buildroot-external/package/python-holmesv/python-holmesv.hash @@ -1 +1 @@ -sha256 763a592034826e4fa214f2672ca0f8887a786c17cac48c4196e5d7dcf7ee9f4f python-holmesv-a12d3021391c0acae765a634120d47bae4742ac9.tar.gz +sha256 6f4b99a69867037e22250f6146fd40692daa9196cc60fb2913ad55eecb4c720c python-holmesv-98c669d4eaa38cb7173b84d718e941315b903729.tar.gz diff --git a/buildroot-external/package/python-holmesv/python-holmesv.mk b/buildroot-external/package/python-holmesv/python-holmesv.mk index f86d98eb..46dc8106 100644 --- a/buildroot-external/package/python-holmesv/python-holmesv.mk +++ b/buildroot-external/package/python-holmesv/python-holmesv.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_HOLMESV_VERSION = a12d3021391c0acae765a634120d47bae4742ac9 +PYTHON_HOLMESV_VERSION = 98c669d4eaa38cb7173b84d718e941315b903729 PYTHON_HOLMESV_SITE = $(call github,HelloChatterbox,HolmesV,$(PYTHON_HOLMESV_VERSION)) PYTHON_HOLMESV_SETUP_TYPE = setuptools PYTHON_HOLMESV_LICENSE_FILES = LICENSE