rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

MycroftOS: Bump python-mycroft to latest version 

- Mycroft version 19.8.3 + Dutch support
- Plus all other requirements updated for this bump.
This commit is contained in:
Peter Steenbergen 2019-11-15 14:07:01 +01:00
parent 093e2d9c52
commit 008f5649ee
11 changed files with 49 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildroot-external/Config.in
View File

@ -29,7 +29,6 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-google-auth/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gpiozero/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gtts/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gtts_token/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-humanhash3/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-lazy/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-monotonic/Config.in"

2
buildroot-external/package/python-gtts/python-gtts.hash
View File

@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/gTTS/json
md5 a74588d23840f07badb195bda8138b2d gTTS-2.0.1.tar.gz
sha256 a6d4cf039da2797de8af2da7c1f0ce700ac0b48601ce6c11a02b337fd6bdcf57 gTTS-2.0.3.tar.gz
sha256 79300af5a61936fd525a0805d5fa85ae77db7301932af251e52fcefddb14de60 gTTS-2.0.4.tar.gz
sha256 124dfc447056cc622989319ebb553d56cfd5c197c345cee3397b675a6da84f58 gTTS-1.1.7.tar.gz
# Locally computed sha256 checksums
sha256 d762ddea99fa1eddb0a03d040a97e4e1404f432f7c70d4b49d391858230a22aa LICENSE

4
buildroot-external/package/python-gtts/python-gtts.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_GTTS_VERSION = 2.0.3
PYTHON_GTTS_VERSION = 2.0.4
PYTHON_GTTS_SOURCE = gTTS-$(PYTHON_GTTS_VERSION).tar.gz
PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/e6/37/f55346a736278f0eb0ae9f7edee1a61028735ef0010db68a2e6fcd0ece56
PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/6b/1c/4c4e9ddde4856e9ea44c6f2e5cb9785cca446ce9addd81ffd1cacad6ddec
PYTHON_GTTS_SETUP_TYPE = setuptools
PYTHON_GTTS_LICENSE = MIT
PYTHON_GTTS_LICENSE_FILES = LICENSE

8
buildroot-external/package/python-gtts_token/Config.in
View File

@ -1,8 +0,0 @@
config BR2_PACKAGE_PYTHON_GTTS_TOKEN
bool "python-gtts_token"
select BR2_PACKAGE_PYTHON_REQUESTS # runtime
help
Calculates a token to run the Google Translate text to
speech.
https://github.com/boudewijn26/gTTS-token

5
buildroot-external/package/python-gtts_token/python-gtts_token.hash
View File

@ -1,5 +0,0 @@
# md5, sha256 from https://pypi.org/pypi/gtts_token/json
md5 39f56680d81c3d553ccc663f013a48f8 gTTS-token-1.1.1.zip
sha256 74badf3ba37773d8ba4a462a09b64de76a0ebd4015d667a6fdb041c2219283ef gTTS-token-1.1.1.zip
sha256 a45d62dc3a4c5ea71ee1fc3349661394cf84cc801197748f408402b2041d6f32 gTTS-token-1.1.2.tar.gz
sha256 9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5 gTTS-token-1.1.3.tar.gz

13
buildroot-external/package/python-gtts_token/python-gtts_token.mk
View File

@ -1,13 +0,0 @@
################################################################################
#
# python-gtts_token
#
################################################################################
PYTHON_GTTS_TOKEN_VERSION = 1.1.3
PYTHON_GTTS_TOKEN_SOURCE = gTTS-token-$(PYTHON_GTTS_TOKEN_VERSION).tar.gz
PYTHON_GTTS_TOKEN_SITE = https://files.pythonhosted.org/packages/e7/25/ca6e9cd3275bfc3097fe6b06cc31db6d3dfaf32e032e0f73fead9c9a03ce
PYTHON_GTTS_TOKEN_SETUP_TYPE = setuptools
PYTHON_GTTS_TOKEN_LICENSE = MIT
$(eval $(python-package))

16
buildroot-external/package/python-mycroft/0001-Bump-python-tornado-and-python-dateutil-versions-as-.patch
View File

@ -1,6 +1,6 @@
From 6f5b4940d26bc3d3413cd750f3e7e17c5e9e5db7 Mon Sep 17 00:00:00 2001
From 830ba05cc56b84b1a3b783d08c063233119639ef Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Wed, 4 Sep 2019 16:01:39 +0200
Date: Fri, 15 Nov 2019 12:55:16 +0100
Subject: [PATCH 1/1] Bump python-tornado and python-dateutil versions as
requirements
@ -9,10 +9,10 @@ Subject: [PATCH 1/1] Bump python-tornado and python-dateutil versions as
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 11f08860cc..661dfcbe03 100644
index 7eeb701c30..0762473922 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ gTTS-token==1.1.3
@@ -5,7 +5,7 @@ gTTS==2.0.4
PyAudio==0.2.11
pyee==5.0.0
SpeechRecognition==3.8.1
@ -21,15 +21,15 @@ index 11f08860cc..661dfcbe03 100644
websocket-client==0.54.0
requests-futures==0.9.5
pyalsaaudio==0.8.2
@@ -16,7 +16,7 @@ psutil==5.2.1
@@ -15,7 +15,7 @@ psutil==5.2.1
pocketsphinx==0.1.0
inflection==0.3.1
pillow==4.1.1
pillow==6.2.1
-python-dateutil==2.6.0
+python-dateutil==2.7.5
pychromecast==3.2.2
python-vlc==1.1.2
pulsectl==17.7.4
google-api-python-client==1.6.4
--
2.11.0
2.24.0.rc1

2
buildroot-external/package/python-mycroft/python-mycroft.hash
View File

@ -1 +1 @@
sha256 b8dedb9491fb10cfb41b9eb0f209a43a4ec06fc00239dd2306580df42e7099ae python-mycroft-a3e35d736b0426f33b7fc1d1883be38e4b650b0b.tar.gz
sha256 da6c5a3245141ce2ac3579d79bbe29df019520517b906d761c127c02095b1a9d python-mycroft-17840decd5e1ca52282bfe1c63b82bb16acf4042.tar.gz

2
buildroot-external/package/python-mycroft/python-mycroft.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
PYTHON_MYCROFT_VERSION = a3e35d736b0426f33b7fc1d1883be38e4b650b0b
PYTHON_MYCROFT_VERSION = 17840decd5e1ca52282bfe1c63b82bb16acf4042
PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION))
PYTHON_MYCROFT_SETUP_TYPE = setuptools
PYTHON_MYCROFT_LICENSE_FILES = LICENSE

38
buildroot-patches/0004-Downgrade-python-pillow-to-4.1.1.patch
View File

@ -1,38 +0,0 @@
From 24d49f0cf58dbbcb47233195b84252ce9897a5c4 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 13:45:45 +0100
Subject: [PATCH 1/1] Downgrade python-pillow to 4.1.1
---
package/python-pillow/python-pillow.hash | 1 +
package/python-pillow/python-pillow.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index fe72d01d38..d67b0407a0 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -2,3 +2,4 @@
# sha256 for LICENSE locally computed
sha256 0804f77cb1e9b6dbd37601cee11283bba39a8d44b9ddb053400c58e0c0d7d9de Pillow-6.1.0.tar.gz
sha256 64ea4328ed56392b423ef968519a9ad427e3de9b985862c95ed2ed4d793d22ee LICENSE
+sha256 00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431 Pillow-4.1.1.tar.gz
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index a4121da2b4..227a664dde 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 6.1.0
+PYTHON_PILLOW_VERSION = 4.1.1
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/51/fe/18125dc680720e4c3086dd3f5f95d80057c41ab98326877fc7d3ff6d0ee5
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7
PYTHON_PILLOW_LICENSE = PIL Software License
PYTHON_PILLOW_LICENSE_FILES = LICENSE
PYTHON_PILLOW_SETUP_TYPE = setuptools
--
2.11.0

36
buildroot-patches/0004-Upgrade-python-pillow-to-6.2.1.patch Normal file
View File

@ -0,0 +1,36 @@
From ea5047295ff6bce30ba65eb53f0e610c0600052d Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Fri, 15 Nov 2019 13:09:01 +0100
Subject: [PATCH 1/1] Upgrade python-pillow to 6.2.1
---
package/python-pillow/python-pillow.hash | 2 +-
package/python-pillow/python-pillow.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index fe72d01d38..4864d61ce7 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -1,4 +1,4 @@
# sha256 for python-pillow from https://pypi.org/project/Pillow/
# sha256 for LICENSE locally computed
-sha256 0804f77cb1e9b6dbd37601cee11283bba39a8d44b9ddb053400c58e0c0d7d9de Pillow-6.1.0.tar.gz
+sha256 bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1 Pillow-6.2.1.tar.gz
sha256 64ea4328ed56392b423ef968519a9ad427e3de9b985862c95ed2ed4d793d22ee LICENSE
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index a4121da2b4..ae277dc2d2 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 6.1.0
+PYTHON_PILLOW_VERSION = 6.2.1
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/51/fe/18125dc680720e4c3086dd3f5f95d80057c41ab98326877fc7d3ff6d0ee5
PYTHON_PILLOW_LICENSE = PIL Software License
--
2.24.0.rc1