diff options
| author | Li Zhou <li.zhou@windriver.com> | 2019-10-17 13:39:14 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-10-19 00:32:30 -0400 |
| commit | 04e0d9de8cbaeb76aff6e78b90941a6e9a359b87 (patch) | |
| tree | cbe01819a24d6e95c4c9b06ac97feb6579a59485 /recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch | |
| parent | 241405f616f22d4208d71b520821b428172e6d6b (diff) | |
| download | meta-virtualization-04e0d9de8cbaeb76aff6e78b90941a6e9a359b87.tar.gz | |
python3-docker-compose: upgrade to version 1.21.2
The python3-docker-compose_1.16.1 requires 'docker<3.0, >=2.5.1', while
python3-docker 3.4.0 is provided. Error occurs when running
'docker-compose --version'.
Upgrade to python3-docker-compose_1.21.2 to make it work.
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch')
| -rw-r--r-- | recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch b/recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch deleted file mode 100644 index 6fc7bb4c..00000000 --- a/recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 15cf1a31f5af8f09531bb837b92bd6ea49bd1744 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Pascal Bach <pascal.bach@siemens.com> | ||
| 3 | Date: Wed, 13 Sep 2017 08:41:21 +0200 | ||
| 4 | Subject: [PATCH] Allow newer versions of requests | ||
| 5 | |||
| 6 | docker compose has strict requirements to use requests < 2.12 | ||
| 7 | |||
| 8 | However it works without issues with newer versions, so this patch removes the check. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Pascal Bach <pascal.bach@siemens.com> | ||
| 13 | --- | ||
| 14 | setup.py | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/setup.py b/setup.py | ||
| 18 | index 192a0f6..f444757 100644 | ||
| 19 | --- a/setup.py | ||
| 20 | +++ b/setup.py | ||
| 21 | @@ -33,7 +33,7 @@ install_requires = [ | ||
| 22 | 'cached-property >= 1.2.0, < 2', | ||
| 23 | 'docopt >= 0.6.1, < 0.7', | ||
| 24 | 'PyYAML >= 3.10, < 4', | ||
| 25 | - 'requests >= 2.6.1, != 2.11.0, < 2.12', | ||
| 26 | + 'requests >= 2.6.1, != 2.11.0', | ||
| 27 | 'texttable >= 0.9.0, < 0.10', | ||
| 28 | 'websocket-client >= 0.32.0, < 1.0', | ||
| 29 | 'docker >= 2.5.1, < 3.0', | ||
| 30 | -- | ||
| 31 | 2.1.4 | ||
| 32 | |||
