From b822e429f04f85d477ffb11409f64d5d8deebe6b Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 5 Jul 2021 12:59:22 +0200 Subject: [PATCH] Bump python-HolmesV --- ...Add-entry_points-to-install-binaries.patch | 36 ------------------- ...{0002-Shut-up.patch => 0001-Shut-up.patch} | 0 ...02-Set-version-string-to-OpenVoiceOS.patch | 25 +++++++++++++ .../0003-Set-version-to-OpenVoiceOS.patch | 25 ------------- .../python-holmesv/python-holmesv.hash | 2 +- .../package/python-holmesv/python-holmesv.mk | 2 +- 6 files changed, 27 insertions(+), 63 deletions(-) delete mode 100644 buildroot-external/package/python-holmesv/0001-Add-entry_points-to-install-binaries.patch rename buildroot-external/package/python-holmesv/{0002-Shut-up.patch => 0001-Shut-up.patch} (100%) create mode 100644 buildroot-external/package/python-holmesv/0002-Set-version-string-to-OpenVoiceOS.patch delete mode 100644 buildroot-external/package/python-holmesv/0003-Set-version-to-OpenVoiceOS.patch diff --git a/buildroot-external/package/python-holmesv/0001-Add-entry_points-to-install-binaries.patch b/buildroot-external/package/python-holmesv/0001-Add-entry_points-to-install-binaries.patch deleted file mode 100644 index 55a40739..00000000 --- a/buildroot-external/package/python-holmesv/0001-Add-entry_points-to-install-binaries.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c33439e2093fe832effcdbe4f04fb912140a40e2 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Sun, 16 May 2021 11:36:09 +0200 -Subject: [PATCH 1/1] Add entry_points for binaries - ---- - setup.py | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index d8b11261..96feec0f 100644 ---- a/setup.py -+++ b/setup.py -@@ -87,5 +87,18 @@ setup( - - }, - packages=find_packages(include=['mycroft*']), -- include_package_data=True -+ include_package_data=True, -+ -+ entry_points={ -+ 'console_scripts': [ -+ 'mycroft-speech-client=mycroft.client.speech.__main__:main', -+ 'mycroft-messagebus=mycroft.messagebus.service.__main__:main', -+ 'mycroft-skills=mycroft.skills.__main__:main', -+ 'mycroft-audio=mycroft.audio.__main__:main', -+ 'mycroft-echo-observer=mycroft.messagebus.client.ws:echo', -+ 'mycroft-audio-test=mycroft.util.audio_test:main', -+ 'mycroft-enclosure-client=mycroft.client.enclosure.__main__:main', -+ 'mycroft-cli-client=mycroft.client.text.__main__:main' -+ ] -+ } - ) --- -2.20.1 - diff --git a/buildroot-external/package/python-holmesv/0002-Shut-up.patch b/buildroot-external/package/python-holmesv/0001-Shut-up.patch similarity index 100% rename from buildroot-external/package/python-holmesv/0002-Shut-up.patch rename to buildroot-external/package/python-holmesv/0001-Shut-up.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 new file mode 100644 index 00000000..7fbc13ed --- /dev/null +++ b/buildroot-external/package/python-holmesv/0002-Set-version-string-to-OpenVoiceOS.patch @@ -0,0 +1,25 @@ +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/0003-Set-version-to-OpenVoiceOS.patch b/buildroot-external/package/python-holmesv/0003-Set-version-to-OpenVoiceOS.patch deleted file mode 100644 index 4771b0f8..00000000 --- a/buildroot-external/package/python-holmesv/0003-Set-version-to-OpenVoiceOS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9a4b0be48247d33c51e82a94bcfc175dbe666cfe Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Sun, 16 May 2021 11:43:32 +0200 -Subject: [PATCH 1/1] Set version 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 7280ce64..f8e6b266 100644 ---- a/mycroft/version/__init__.py -+++ b/mycroft/version/__init__.py -@@ -31,7 +31,7 @@ CORE_VERSION_BUILD = 1 - CORE_VERSION_TUPLE = (CORE_VERSION_MAJOR, - CORE_VERSION_MINOR, - CORE_VERSION_BUILD) --CORE_VERSION_STR = '.'.join(map(str, CORE_VERSION_TUPLE)) + "(HolmesV)" -+CORE_VERSION_STR = '.'.join(map(str, CORE_VERSION_TUPLE)) + "(OpenVoiceOS)" - - - class VersionManager: --- -2.20.1 - diff --git a/buildroot-external/package/python-holmesv/python-holmesv.hash b/buildroot-external/package/python-holmesv/python-holmesv.hash index 50bec211..c5b35c10 100644 --- a/buildroot-external/package/python-holmesv/python-holmesv.hash +++ b/buildroot-external/package/python-holmesv/python-holmesv.hash @@ -1 +1 @@ -sha256 c1824421c7d1b228a38de0c031a4dbd571cfc9428175ea2d7ec174f843a7e317 python-holmesv-5712518f13286a06ffe2921d746bdb20a04a06f0.tar.gz +sha256 71730d9da421fdff63e33860491c47252da6cbff7912fe0f290fcaa198946b8f python-holmesv-b00142baf2ca9d7c076611bc7aeffdf2ede83916.tar.gz diff --git a/buildroot-external/package/python-holmesv/python-holmesv.mk b/buildroot-external/package/python-holmesv/python-holmesv.mk index 07711e5a..9dd37c83 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 = 5712518f13286a06ffe2921d746bdb20a04a06f0 +PYTHON_HOLMESV_VERSION = b00142baf2ca9d7c076611bc7aeffdf2ede83916 PYTHON_HOLMESV_SITE = $(call github,HelloChatterbox,HolmesV,$(PYTHON_HOLMESV_VERSION)) PYTHON_HOLMESV_SETUP_TYPE = setuptools PYTHON_HOLMESV_LICENSE_FILES = LICENSE