diff options
Diffstat (limited to 'recipes-containers')
| -rw-r--r-- | recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch | 32 | ||||
| -rw-r--r-- | recipes-containers/docker-compose/python3-docker-compose_1.16.1.bb | 31 |
2 files changed, 63 insertions, 0 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 new file mode 100644 index 00000000..6fc7bb4c --- /dev/null +++ b/recipes-containers/docker-compose/files/0001-Allow-newer-versions-of-requests.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 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 | |||
diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.16.1.bb b/recipes-containers/docker-compose/python3-docker-compose_1.16.1.bb new file mode 100644 index 00000000..50e76b7e --- /dev/null +++ b/recipes-containers/docker-compose/python3-docker-compose_1.16.1.bb | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | SUMMARY = "Multi-container orchestration for Docker" | ||
| 2 | HOMEPAGE = "https://www.docker.com/" | ||
| 3 | LICENSE = "Apache-2.0" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" | ||
| 5 | |||
| 6 | SRC_URI += "file://0001-Allow-newer-versions-of-requests.patch" | ||
| 7 | |||
| 8 | inherit pypi setuptools3 | ||
| 9 | |||
| 10 | SRC_URI[md5sum] = "8dcadf09143600fcb573b43f446c8f9a" | ||
| 11 | SRC_URI[sha256sum] = "fb46a6a2c4d193a3ff1e4d7208eea920b629c81dc92257c87f3f93095cfb0bdf" | ||
| 12 | |||
| 13 | RDEPENDS_${PN} = "\ | ||
| 14 | ${PYTHON_PN}-cached-property \ | ||
| 15 | ${PYTHON_PN}-certifi \ | ||
| 16 | ${PYTHON_PN}-chardet \ | ||
| 17 | ${PYTHON_PN}-colorama \ | ||
| 18 | ${PYTHON_PN}-docker \ | ||
| 19 | ${PYTHON_PN}-docker-pycreds \ | ||
| 20 | ${PYTHON_PN}-dockerpty \ | ||
| 21 | ${PYTHON_PN}-docopt \ | ||
| 22 | ${PYTHON_PN}-enum \ | ||
| 23 | ${PYTHON_PN}-idna \ | ||
| 24 | ${PYTHON_PN}-jsonschema \ | ||
| 25 | ${PYTHON_PN}-pyyaml \ | ||
| 26 | ${PYTHON_PN}-requests \ | ||
| 27 | ${PYTHON_PN}-six \ | ||
| 28 | ${PYTHON_PN}-texttable \ | ||
| 29 | ${PYTHON_PN}-urllib3 \ | ||
| 30 | ${PYTHON_PN}-websocket-client \ | ||
| 31 | " | ||
