rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-06-05 22:19:21 +02:00
Code Issues Releases Wiki Activity

MycroftOS: Bump Mycroft to latest version.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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))