MycroftOS: Remove python-typing requirement for Python 3.8 compatibility

This commit is contained in:
Peter Steenbergen 2019-12-08 13:19:58 +01:00
parent d7925b6496
commit 1adee13f9f
4 changed files with 50 additions and 2 deletions

View File

@ -0,0 +1,25 @@
From a918c7274654865534f42590608407b2d61d1972 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 8 Dec 2019 12:34:31 +0100
Subject: [PATCH 1/1] Only install typing requirement if Python version < 3.5
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 62928e2..b4b6746 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ setup(
version='0.3.14', # 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'],
url='https://github.com/MycroftAI/mycroft-skills-kit',
license='Apache-2.0',
author='Mycroft AI',
--
2.24.0.rc1

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_PYTHON_MSK
bool "python-msk"
select BR2_PACKAGE_PYTHON_GITPYTHON # runtime
select BR2_PACKAGE_PYTHON_TYPING # runtime
select BR2_PACKAGE_PYTHON_MSM # runtime
select BR2_PACKAGE_PYTHON_PYGITHUB # runtime
help

View File

@ -0,0 +1,25 @@
From 79bfc57404cd8d42236283b44f956209ff486e21 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 8 Dec 2019 12:54:33 +0100
Subject: [PATCH 1/1] Only install typing if Python version < 3.5
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 5e3167a..18eb0fc 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ setup(
version='0.8.3',
packages=['msm'],
install_requires=[
- 'GitPython', 'typing', 'fasteners', 'pyyaml', 'pako',
+ 'GitPython', 'typing;python_version<"3.5"', 'fasteners', 'pyyaml', 'pako',
'lazy'
],
url='https://github.com/MycroftAI/mycroft-skills-manager',
--
2.24.0.rc1

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_PYTHON_MSM
bool "python-msm"
select BR2_PACKAGE_PYTHON_GITPYTHON # runtime
select BR2_PACKAGE_PYTHON_TYPING # runtime
help
Mycroft Skills Manager.