diff options
Diffstat (limited to 'external/meta-virtualization/recipes-containers/docker-compose/files')
3 files changed, 87 insertions, 32 deletions
diff --git a/external/meta-virtualization/recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch b/external/meta-virtualization/recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch deleted file mode 100644 index 6fc7bb4c..00000000 --- a/external/meta-virtualization/recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 15cf1a31f5af8f09531bb837b92bd6ea49bd1744 Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@siemens.com> -Date: Wed, 13 Sep 2017 08:41:21 +0200 -Subject: [PATCH] Allow newer versions of requests - -docker compose has strict requirements to use requests < 2.12 - -However it works without issues with newer versions, so this patch removes the check. - -Upstream-Status: Pending - -Signed-off-by: Pascal Bach <pascal.bach@siemens.com> ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 192a0f6..f444757 100644 ---- a/setup.py -+++ b/setup.py -@@ -33,7 +33,7 @@ install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 0.7', - 'PyYAML >= 3.10, < 4', -- 'requests >= 2.6.1, != 2.11.0, < 2.12', -+ 'requests >= 2.6.1, != 2.11.0', - 'texttable >= 0.9.0, < 0.10', - 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 2.5.1, < 3.0', --- -2.1.4 - diff --git a/external/meta-virtualization/recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch b/external/meta-virtualization/recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch new file mode 100644 index 00000000..df613e84 --- /dev/null +++ b/external/meta-virtualization/recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch @@ -0,0 +1,28 @@ +From f3a22f0f14a4b3313e6405dfb6c97df949493a34 Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Thu, 30 Jan 2020 17:22:19 +0100 +Subject: [PATCH] setup.py: import fastentrypoints + +Upstream-Status: Inappropriate [OE specific configuration] + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index ad57969..3cccffc 100644 +--- a/setup.py ++++ b/setup.py +@@ -12,7 +12,7 @@ import sys + import pkg_resources + from setuptools import find_packages + from setuptools import setup +- ++import fastentrypoints + + def read(*parts): + path = os.path.join(os.path.dirname(__file__), *parts) +-- +2.7.4 + diff --git a/external/meta-virtualization/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch b/external/meta-virtualization/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch new file mode 100644 index 00000000..6e5ca3d6 --- /dev/null +++ b/external/meta-virtualization/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch @@ -0,0 +1,59 @@ +From 1d358acd46c9ca71d848fca8c2d677414257f247 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 22 Nov 2019 09:24:58 +0800 +Subject: [PATCH] setup.py: remove maximum version requirements + +Remove maximum version requirements so that docker-compose will not +require old version recipes. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + setup.py | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/setup.py b/setup.py +index 110441dc..eef28254 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,16 +30,16 @@ def find_version(*file_paths): + + + install_requires = [ +- 'cached-property >= 1.2.0, < 2', +- 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 6', +- 'requests >= 2.20.0, < 3', +- 'texttable >= 0.9.0, < 2', +- 'websocket-client >= 0.32.0, < 1', +- 'docker[ssh] >= 3.7.0, < 5', +- 'dockerpty >= 0.4.1, < 1', +- 'six >= 1.3.0, < 2', +- 'jsonschema >= 2.5.1, < 4', ++ 'cached-property >= 1.2.0', ++ 'docopt >= 0.6.1', ++ 'PyYAML >= 3.10', ++ 'requests >= 2.20.0', ++ 'texttable >= 0.9.0', ++ 'websocket-client >= 0.32.0', ++ 'docker[ssh] >= 3.7.0', ++ 'dockerpty >= 0.4.1', ++ 'six >= 1.3.0', ++ 'jsonschema >= 2.5.1', + ] + + +@@ -58,7 +58,7 @@ extras_require = { + ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', + 'ipaddress >= 1.0.16, < 2'], + ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + } + + +-- +2.25.0 + |