summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
diff options
context:
space:
mode:
authorLi Zhou <li.zhou@windriver.com>2019-10-17 13:39:14 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-10-19 00:32:30 -0400
commit04e0d9de8cbaeb76aff6e78b90941a6e9a359b87 (patch)
treecbe01819a24d6e95c4c9b06ac97feb6579a59485 /recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
parent241405f616f22d4208d71b520821b428172e6d6b (diff)
downloadmeta-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-docker-compose-support-newer-minor-version-of-reques.patch')
-rw-r--r--recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch b/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
new file mode 100644
index 00000000..48a6f25c
--- /dev/null
+++ b/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
@@ -0,0 +1,44 @@
1From b4655b5e7f1e5b87a758dfd7af01a49a40ed148a Mon Sep 17 00:00:00 2001
2From: Li Zhou <li.zhou@windriver.com>
3Date: Thu, 10 Oct 2019 15:46:20 +0800
4Subject: [PATCH] docker-compose: support newer minor version of requests
5
6Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
7
8Upstream-Status: Backport
9
10Signed-off-by: Li Zhou <li.zhou@windriver.com>
11---
12 requirements.txt | 2 +-
13 setup.py | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/requirements.txt b/requirements.txt
17index 93a0cce..42bde41 100644
18--- a/requirements.txt
19+++ b/requirements.txt
20@@ -16,7 +16,7 @@ pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
21 pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6'
22 PySocks==1.6.7
23 PyYAML==3.12
24-requests==2.18.4
25+requests==2.19.1
26 six==1.10.0
27 texttable==0.9.1
28 urllib3==1.21.1
29diff --git a/setup.py b/setup.py
30index 422ba54..a74ee0f 100644
31--- a/setup.py
32+++ b/setup.py
33@@ -33,7 +33,7 @@ install_requires = [
34 'cached-property >= 1.2.0, < 2',
35 'docopt >= 0.6.1, < 0.7',
36 'PyYAML >= 3.10, < 4',
37- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
38+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.20',
39 'texttable >= 0.9.0, < 0.10',
40 'websocket-client >= 0.32.0, < 1.0',
41 'docker >= 3.3.0, < 4.0',
42--
431.9.1
44