From 0ee0c85e64a2f4a8005eb418ead749db7c2a1320 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Fri, 29 May 2020 17:24:58 +0200 Subject: testing/mycroft-core: upgrade to 20.2.4 --- .../mycroft-core/0004-relax-dep-requirements.patch | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 testing/mycroft-core/0004-relax-dep-requirements.patch (limited to 'testing/mycroft-core/0004-relax-dep-requirements.patch') diff --git a/testing/mycroft-core/0004-relax-dep-requirements.patch b/testing/mycroft-core/0004-relax-dep-requirements.patch deleted file mode 100644 index 56b85a29c79..00000000000 --- a/testing/mycroft-core/0004-relax-dep-requirements.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream pull-request: https://github.com/MycroftAI/mycroft-core/pull/2562 - -From 466d39fd4057ab17492877edd18131541cd88e15 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=85ke=20Forslund?= -Date: Mon, 4 May 2020 09:28:48 +0200 -Subject: [PATCH] Allow building Mycroft with loose requirements - ---- - setup.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/setup.py b/setup.py -index c98f7b4f8f9..3d08cbbd943 100644 ---- a/setup.py -+++ b/setup.py -@@ -13,6 +13,7 @@ - # limitations under the License. - # - from setuptools import setup, find_packages -+import os - import os.path - - BASEDIR = os.path.abspath(os.path.dirname(__file__)) -@@ -44,6 +45,9 @@ def required(requirements_file): - """ Read requirements file and remove comments and empty lines. """ - with open(os.path.join(BASEDIR, requirements_file), 'r') as f: - requirements = f.read().splitlines() -+ if 'MYCROFT_LOOSE_REQUIREMENTS' in os.environ: -+ print('USING LOOSE REQUIREMENTS!') -+ requirements = [r.replace('==', '>=') for r in requirements] - return [pkg for pkg in requirements - if pkg.strip() and not pkg.startswith("#")] - -- cgit v1.2.3