Bump mycroft-core and some python packages
This commit is contained in:
j1nx
parent
1b27602081
commit
6c3d4e28f8
|
|
@ -0,0 +1,24 @@
|
|||
From 2342dde59f02b3cab1a961f74eaf06889fb8d175 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Tue, 29 Dec 2020 10:29:43 +0100
|
||||
Subject: [PATCH 1/1] Bump requests requirement to >= 2.24.0 inline with
|
||||
buildroot. This to prevent issues with the urllib3 package in combination
|
||||
with the HASS skill.
|
||||
|
||||
---
|
||||
requirements/requirements.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
|
||||
index abe48fa508..8dc55a9756 100644
|
||||
--- a/requirements/requirements.txt
|
||||
+++ b/requirements/requirements.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-requests==2.20.0
|
||||
+requests>=2.24.0
|
||||
gTTS==2.2.0
|
||||
PyAudio==0.2.11
|
||||
pyee==8.1.0
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1 +1 @@
|
|||
sha256 e014ddc64471b0bb0371fe98f32704bdc4e399f05dbd9a4d2f7e9c2c91173036 python-mycroft-4c254aa99f11bb9c027c728908198a3376cd39f3.tar.gz
|
||||
sha256 edda85888f73e98ab0f60e7d7bbae045becff69f4b6494aab6e47e321356b680 python-mycroft-0050bde937e1741356031d2adca1fbc0cfcb3fb7.tar.gz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_MYCROFT_VERSION = 4c254aa99f11bb9c027c728908198a3376cd39f3
|
||||
PYTHON_MYCROFT_VERSION = 0050bde937e1741356031d2adca1fbc0cfcb3fb7
|
||||
PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION))
|
||||
PYTHON_MYCROFT_SETUP_TYPE = setuptools
|
||||
PYTHON_MYCROFT_LICENSE_FILES = LICENSE
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
From 6247525c7f76f33cbbbb7ee447c6acbb23114ecd Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Thu, 29 Oct 2020 19:52:13 +0100
|
||||
Subject: [PATCH 1/1] Downgrade python-six to 1.13.0
|
||||
|
||||
---
|
||||
package/python-six/python-six.hash | 2 +-
|
||||
package/python-six/python-six.mk | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/package/python-six/python-six.hash b/package/python-six/python-six.hash
|
||||
index 9945ffd1d7..22aca3f4bd 100644
|
||||
--- a/package/python-six/python-six.hash
|
||||
+++ b/package/python-six/python-six.hash
|
||||
@@ -1,5 +1,5 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/six/json
|
||||
md5 9f90a0eaa0ea7747fda01ca79d21ebcb six-1.15.0.tar.gz
|
||||
-sha256 30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 six-1.15.0.tar.gz
|
||||
+sha256 30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66 six-1.13.0.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE
|
||||
diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk
|
||||
index e7621f5ecb..906c268d74 100644
|
||||
--- a/package/python-six/python-six.mk
|
||||
+++ b/package/python-six/python-six.mk
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
-PYTHON_SIX_VERSION = 1.15.0
|
||||
+PYTHON_SIX_VERSION = 1.13.0
|
||||
PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz
|
||||
-PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/6b/34/415834bfdafca3c5f451532e8a8d9ba89a21c9743a0c59fbd0205c7f9426
|
||||
+PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/94/3e/edcf6fef41d89187df7e38e868b2dd2182677922b600e880baad7749c865
|
||||
PYTHON_SIX_SETUP_TYPE = setuptools
|
||||
PYTHON_SIX_LICENSE = MIT
|
||||
PYTHON_SIX_LICENSE_FILES = LICENSE
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
From f4f16da4d8b5101c217e585356ae7e1e0de32d00 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Wed, 16 Dec 2020 15:32:38 +0100
|
||||
Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0
|
||||
|
||||
---
|
||||
package/python-requests/python-requests.hash | 2 +-
|
||||
package/python-requests/python-requests.mk | 4 ++--
|
||||
package/python3-requests/python3-requests.mk | 4 ++--
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash
|
||||
index 84bf2a1aa0..e088ed8bef 100644
|
||||
--- a/package/python-requests/python-requests.hash
|
||||
+++ b/package/python-requests/python-requests.hash
|
||||
@@ -1,5 +1,5 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/requests/json
|
||||
md5 b54bff26a389e5932e8b1c4983a99ce7 requests-2.24.0.tar.gz
|
||||
-sha256 b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b requests-2.24.0.tar.gz
|
||||
+sha256 99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c requests-2.20.0.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 8837a2f33a61bcee175c028ff16d1c160aba48a3aebe1495ace709be4e62636b LICENSE
|
||||
diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk
|
||||
index eb3997f108..38dae8d8bf 100644
|
||||
--- a/package/python-requests/python-requests.mk
|
||||
+++ b/package/python-requests/python-requests.mk
|
||||
@@ -5,9 +5,9 @@
|
||||
################################################################################
|
||||
|
||||
# Please keep in sync with package/python3-requests/python3-requests.mk
|
||||
-PYTHON_REQUESTS_VERSION = 2.24.0
|
||||
+PYTHON_REQUESTS_VERSION = 2.20.0
|
||||
PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz
|
||||
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/da/67/672b422d9daf07365259958912ba533a0ecab839d4084c487a5fe9a5405f
|
||||
+PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c
|
||||
PYTHON_REQUESTS_SETUP_TYPE = setuptools
|
||||
PYTHON_REQUESTS_LICENSE = Apache-2.0
|
||||
PYTHON_REQUESTS_LICENSE_FILES = LICENSE
|
||||
diff --git a/package/python3-requests/python3-requests.mk b/package/python3-requests/python3-requests.mk
|
||||
index cd6a7e1260..a1f2567115 100644
|
||||
--- a/package/python3-requests/python3-requests.mk
|
||||
+++ b/package/python3-requests/python3-requests.mk
|
||||
@@ -5,9 +5,9 @@
|
||||
################################################################################
|
||||
|
||||
# Please keep in sync with package/python-requests/python-requests.mk
|
||||
-PYTHON3_REQUESTS_VERSION = 2.24.0
|
||||
+PYTHON3_REQUESTS_VERSION = 2.20.0
|
||||
PYTHON3_REQUESTS_SOURCE = requests-$(PYTHON3_REQUESTS_VERSION).tar.gz
|
||||
-PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/f5/4f/280162d4bd4d8aad241a21aecff7a6e46891b905a4341e7ab549ebaf7915
|
||||
+PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c
|
||||
PYTHON3_REQUESTS_SETUP_TYPE = setuptools
|
||||
PYTHON3_REQUESTS_LICENSE = Apache-2.0
|
||||
PYTHON3_REQUESTS_LICENSE_FILES = LICENSE
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From b19a7fdda65749360076366b25f8751e1f6b71a5 Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Wed, 16 Dec 2020 19:12:49 +0100
|
||||
Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2
|
||||
|
||||
---
|
||||
package/python-urllib3/python-urllib3.hash | 2 +-
|
||||
package/python-urllib3/python-urllib3.mk | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash
|
||||
index e29966672a..cb9b48d3e2 100644
|
||||
--- a/package/python-urllib3/python-urllib3.hash
|
||||
+++ b/package/python-urllib3/python-urllib3.hash
|
||||
@@ -1,5 +1,5 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/urllib3/json
|
||||
md5 d47dd21a6e66a03c3633cac468ffd010 urllib3-1.25.11.tar.gz
|
||||
-sha256 8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 urllib3-1.25.11.tar.gz
|
||||
+sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt
|
||||
diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk
|
||||
index 88e8d2097b..893d32d976 100644
|
||||
--- a/package/python-urllib3/python-urllib3.mk
|
||||
+++ b/package/python-urllib3/python-urllib3.mk
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
-PYTHON_URLLIB3_VERSION = 1.25.11
|
||||
+PYTHON_URLLIB3_VERSION = 1.24.2
|
||||
PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz
|
||||
-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/76/d9/bbbafc76b18da706451fa91bc2ebe21c0daf8868ef3c30b869ac7cb7f01d
|
||||
+PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62
|
||||
PYTHON_URLLIB3_LICENSE = MIT
|
||||
PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt
|
||||
PYTHON_URLLIB3_SETUP_TYPE = setuptools
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Loading…
Reference in New Issue