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

MycroftOS: Bump Mycroft to latest version. 

including all bumped requirements
This commit is contained in:
j1nx 2020-05-14 21:27:20 +02:00
parent d33eaf2782
commit b1999bd9d5
10 changed files with 44 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-use-MANIFEST.in-for-package-data.patch
View File

@ -1,12 +1,12 @@
From 4913ea0149f03cfccd62f1e41326164a457fdb38 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Thu, 26 Mar 2020 08:41:14 +0100
From d0c3fe321f90bfe923b2c26488ad0db56cfad756 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 14 May 2020 20:11:58 +0200
Subject: [PATCH 1/1] Patch setup.py to use MANIFEST.in for package data
---
MANIFEST.in | 1 +
setup.py | 17 +----------------
2 files changed, 2 insertions(+), 16 deletions(-)
setup.py | 16 ----------------
2 files changed, 1 insertion(+), 16 deletions(-)
create mode 100644 MANIFEST.in
diff --git a/MANIFEST.in b/MANIFEST.in
@ -17,7 +17,7 @@ index 0000000..97513c5
@@ -0,0 +1 @@
+graft lingua_franca
diff --git a/setup.py b/setup.py
index ce0be2f..e25f0a2 100644
index c72039e..b927dfa 100644
--- a/setup.py
+++ b/setup.py
@@ -3,14 +3,6 @@ import os
@ -46,7 +46,7 @@ index ce0be2f..e25f0a2 100644
-
setup(
name='lingua_franca',
version='0.2.0',
version='0.2.1',
packages=['test', 'lingua_franca', 'lingua_franca.lang'],
url='https://github.com/MycroftAI/lingua-franca',
license='Apache2.0',
@ -61,13 +61,6 @@ index ce0be2f..e25f0a2 100644
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
@@ -49,5 +33,6 @@ setup(
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
],
)
--
2.25.0
2.20.1

2
buildroot-external/package/python-lingua-franca/python-lingua-franca.hash
View File

@ -1 +1 @@
sha256 bc34c218a47f66e434a4d9de69d82f1a196b944306dddfddb6426cd270fd00cd python-lingua-franca-a45b9d12a2a8adace210055a38f432dd51e7456d.tar.gz
sha256 8de3af6e844b5935326970da084cdc8eae047c4dd4fa8183a10753791c7a5970 python-lingua-franca-d3444bb6578326168c038e03f2124dfb871c2a52.tar.gz

2
buildroot-external/package/python-lingua-franca/python-lingua-franca.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
PYTHON_LINGUA_FRANCA_VERSION = a45b9d12a2a8adace210055a38f432dd51e7456d
PYTHON_LINGUA_FRANCA_VERSION = d3444bb6578326168c038e03f2124dfb871c2a52
PYTHON_LINGUA_FRANCA_SITE = $(call github,MycroftAI,lingua-franca,$(PYTHON_LINGUA_FRANCA_VERSION))
PYTHON_LINGUA_FRANCA_SETUP_TYPE = setuptools
PYTHON_LINGUA_FRANCA_LICENSE = Apache-2.0

18
buildroot-external/package/python-msk/0001-Only-install-typing-requirement-if-Python-version-3..patch
View File

@ -1,6 +1,6 @@
From a918c7274654865534f42590608407b2d61d1972 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 8 Dec 2019 12:34:31 +0100
From c2260f7f28a092c715390a16f1176071dc030f7e Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 14 May 2020 20:17:20 +0200
Subject: [PATCH 1/1] Only install typing requirement if Python version < 3.5
---
@ -8,18 +8,18 @@ Subject: [PATCH 1/1] Only install typing requirement if Python version < 3.5
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 62928e2..b4b6746 100644
index 246a4e7..d4ab75f 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ setup(
version='0.3.14', # Also update in msk/__init__.py
version='0.3.15', # Also update in msk/__init__.py
packages=['msk', 'msk.actions'],
package_data={'msk': ['licenses/*']},
- install_requires=['GitPython', 'typing', 'msm>=0.5.13', 'pygithub', 'requests', 'colorama'],
+ install_requires=['GitPython', 'typing;python_version<"3.5"', 'msm>=0.5.13', 'pygithub', 'requests', 'colorama'],
- install_requires=['GitPython>=3.0.5', 'typing', 'msm>=0.5.13', 'pygithub',
+ install_requires=['GitPython>=3.0.5', 'typing;python_version<"3.5"', 'msm>=0.5.13', 'pygithub',
'requests', 'colorama'],
url='https://github.com/MycroftAI/mycroft-skills-kit',
license='Apache-2.0',
author='Mycroft AI',
--
2.24.0.rc1
2.20.1

1
buildroot-external/package/python-msk/python-msk.hash
View File

@ -4,3 +4,4 @@ sha256 d5c157a60eecba4c3b07de89e43e85dec366b5ecdd3677f7e73c0c4cddf01b74 msk-0.3
sha256 8e5a1fb7afa22977a9d6ee0835ac52420b74324c1d2088286aacc485a521e573 msk-0.3.12.tar.gz
sha256 55be86ff2cd0087016759f2b15b40861cda2a8d8a8d0c669fdacdf32a77a10da msk-0.3.13.tar.gz
sha256 6620b5412316cc4b3111d0720424ac6a1a837b2bc3e6fb0c11076e95b6496d29 msk-0.3.14.tar.gz
sha256 56d3557889ee2ceebc72284f979aa6ddd4c7fbe2af31142eb6f51404f14516d5 msk-0.3.15.tar.gz

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

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_MSK_VERSION = 0.3.14
PYTHON_MSK_VERSION = 0.3.15
PYTHON_MSK_SOURCE = msk-$(PYTHON_MSK_VERSION).tar.gz
PYTHON_MSK_SITE = https://files.pythonhosted.org/packages/ef/de/d21d7d7c59f54b02910da5f4e5b77af9c40f5477079bcdfd0170e5ed4517
PYTHON_MSK_SITE = https://files.pythonhosted.org/packages/8a/80/5bd3efb6affe84e9626f10cfa8edf5dd87dba1ce3d136e01c694cc1fe368
PYTHON_MSK_SETUP_TYPE = setuptools
$(eval $(python-package))

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

@ -1 +1 @@
sha256 7a34207ca9ad8071d57403cb082d34c5021842f1efe1bd87f44bfc0bf0ef4c36 python-mycroft-8a3cf544cd26e1e5ff6ea46b55fc093fc04ab246.tar.gz
sha256 93e4182ee369531e20fcee5c669723514427dfcdf9b20ebd33f4fa0c93f24a12 python-mycroft-90d2570cc3c6e50b66ec1fa82d24b0eac9f08033.tar.gz

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

@ -4,7 +4,7 @@
#
################################################################################
PYTHON_MYCROFT_VERSION = 8a3cf544cd26e1e5ff6ea46b55fc093fc04ab246
PYTHON_MYCROFT_VERSION = 90d2570cc3c6e50b66ec1fa82d24b0eac9f08033
PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION))
PYTHON_MYCROFT_SETUP_TYPE = setuptools
PYTHON_MYCROFT_LICENSE_FILES = LICENSE

20
buildroot-patches/0002-Downgrade-python-pillow-to-6.2.1.patch → buildroot-patches/0002-Upgrade-python-pillow-to-7.1.2.patch
View File

@ -1,7 +1,7 @@
From 46d16b74aa2d8b0f093cb7c954b778a3f7e7e806 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 17 Mar 2020 08:39:23 +0100
Subject: [PATCH 1/1] Downgrade python-pillow to 6.2.1
From 6b95294b24c271290d56bc7356ddb89c4d106804 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 14 May 2020 19:46:33 +0200
Subject: [PATCH 1/1] Upgrade python-pillow to 7.1.2
---
package/python-pillow/python-pillow.hash | 2 +-
@ -9,18 +9,18 @@ Subject: [PATCH 1/1] Downgrade python-pillow to 6.2.1
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index 0d66c4bb3c..d386286a83 100644
index 0d66c4bb3c..a5fdaa06ad 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/project/Pillow/
md5 d099946335c1ba372f5b1fa68ca71645 Pillow-7.0.0.tar.gz
-sha256 4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946 Pillow-7.0.0.tar.gz
+sha256 bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1 Pillow-6.2.1.tar.gz
+sha256 a0b49960110bc6ff5fead46013bcb8825d101026d466f3a4de3476defe0fb0dd Pillow-7.1.2.tar.gz
# Locally computed sha256 checksums
sha256 04a04a908e52921829c7f51528e5619c79becdde99c484ab7d4f235e2927968c LICENSE
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index 5ff2dcfdb6..8c4db213c6 100644
index 5ff2dcfdb6..2832eeee0b 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,8 +4,8 @@
@ -29,11 +29,11 @@ index 5ff2dcfdb6..8c4db213c6 100644
-PYTHON_PILLOW_VERSION = 7.0.0
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/39/47/f28067b187dd664d205f75b07dcc6e0e95703e134008a14814827eebcaab
+PYTHON_PILLOW_VERSION = 6.2.1
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/5b/bb/cdc8086db1f15d0664dd22a62c69613cdc00f1dd430b5b19df1bea83f2a3
+PYTHON_PILLOW_VERSION = 7.1.2
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/ce/ef/e793f6ffe245c960c42492d0bb50f8d14e2ba223f1922a5c3c81569cec44
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
PYTHON_PILLOW_LICENSE = PIL Software License
PYTHON_PILLOW_LICENSE_FILES = LICENSE
--
2.25.0
2.20.1

20
buildroot-patches/0003-Downgrade-python-psutil-to-5.2.1.patch → buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch
View File

@ -1,7 +1,7 @@
From c0b1078bdcd32d27872aebb5e43bdd496b8315fa Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 17 Mar 2020 08:44:43 +0100
Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
From 6ada66130fb2300d9ab7ff14e98e3fc79ecba056 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 14 May 2020 19:38:22 +0200
Subject: [PATCH 1/1] Downgrade python-psutil to 5.6.6
---
package/python-psutil/python-psutil.hash | 2 +-
@ -9,18 +9,18 @@ Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash
index 7f3d629d66..90578d2b15 100644
index 7f3d629d66..9e273580b7 100644
--- a/package/python-psutil/python-psutil.hash
+++ b/package/python-psutil/python-psutil.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/psutil/json
md5 b2c94e0368fc6e6f237a7252f8e85ca2 psutil-5.6.7.tar.gz
-sha256 ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa psutil-5.6.7.tar.gz
+sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz
+sha256 ad21281f7bd6c57578dd53913d2d44218e9e29fd25128d10ff7819ef16fa46e7 psutil-5.6.6.tar.gz
# Locally computed sha256 checksums
sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE
diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk
index 62a94f3c41..162d1b7f50 100644
index 62a94f3c41..5d18b6c001 100644
--- a/package/python-psutil/python-psutil.mk
+++ b/package/python-psutil/python-psutil.mk
@@ -4,9 +4,9 @@
@ -28,13 +28,13 @@ index 62a94f3c41..162d1b7f50 100644
################################################################################
-PYTHON_PSUTIL_VERSION = 5.6.7
+PYTHON_PSUTIL_VERSION = 5.2.1
+PYTHON_PSUTIL_VERSION = 5.6.6
PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb
+PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240
+PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/5f/dc/edf6758183afc7591a16bd4b8a44d8eea80aca1327ea60161dd3bad9ad22
PYTHON_PSUTIL_SETUP_TYPE = setuptools
PYTHON_PSUTIL_LICENSE = BSD-3-Clause
PYTHON_PSUTIL_LICENSE_FILES = LICENSE
--
2.25.0
2.20.1