From a1d06c7470c7a1e57c88fc2479559ace4b67db26 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Fri, 26 Jun 2020 18:16:01 +0200 Subject: python3-docker-compose: uprev 1.25.5 > 1.26.0 The major changes include: d4451659 Bump 1.26.0 3d94f442 Bump 1.26.0-rc5 1386a855 Merge pull request #7485 from ulyssessouza/fix-https-daemon 8034c96d Bump docker-py 48d09369 Fix flake8 errors 28bf47ce Pin wcwidth==0.1.9 d279b7a8 Bump 1.26.0-rc4 83371df2 Merge branch 'master' into 1.26.x 9c5351cf Merge pull request #7389 from ulyssessouza/general-bumps-for-1_26 836e2b7c General bumps 266d287e Merge pull request #7390 from ulyssessouza/remove-unused-resources d64f3f39 Remove unused files 4e310a94 Merge pull request #7386 from ulyssessouza/bump-python-dotenv-1_13_0 d52b51e8 Bump python-dotenv from 0.11.0 to 0.13.0 64a6a48b Merge pull request #7345 from docker/dependabot/pip/certifi-2020.4.5.1 0979c7a1 Merge pull request #7380 from joehattori/simplify-code ce782b59 Simplify code in compose/config/config.py b7d6dc79 Bump certifi from 2019.11.28 to 2020.4.5.1 c22a2510 Merge pull request #7374 from ulyssessouza/fix-distro-guess a62a1e1d Add "distro" package afc5d205 Merge pull request #7371 from ulyssessouza/bump-openssl-111f 4d2afc07 Merge pull request #7372 from ulyssessouza/update-changelog Have verified on arm/arm64/x86_64 against: https://docs.docker.com/compose/gettingstarted Signed-off-by: Ming Liu Signed-off-by: Bruce Ashfield --- ...up.py-remove-maximum-version-requirements.patch | 13 ++++--- .../python3-docker-compose_1.25.5.bb | 38 -------------------- .../python3-docker-compose_1.26.0.bb | 41 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 42 deletions(-) delete mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.25.5.bb create mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.26.0.bb (limited to 'recipes-containers') diff --git a/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch index 6e5ca3d6..f517d05a 100644 --- a/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch +++ b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch @@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Chen Qi Signed-off-by: Ming Liu --- - setup.py | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) + setup.py | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 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): +@@ -30,18 +30,18 @@ def find_version(*file_paths): install_requires = [ @@ -28,29 +28,34 @@ index 110441dc..eef28254 100644 - 'requests >= 2.20.0, < 3', - 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', +- 'distro >= 1.5.0, < 2', - 'docker[ssh] >= 3.7.0, < 5', - 'dockerpty >= 0.4.1, < 1', - 'six >= 1.3.0, < 2', - 'jsonschema >= 2.5.1, < 4', +- 'python-dotenv >= 0.13.0, < 1', + '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', ++ 'distro >= 1.5.0', + 'docker[ssh] >= 3.7.0', + 'dockerpty >= 0.4.1', + 'six >= 1.3.0', + 'jsonschema >= 2.5.1', ++ 'python-dotenv >= 0.13.0', ] -@@ -58,7 +58,7 @@ extras_require = { +@@ -61,7 +61,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'], + 'tests': tests_require, } diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.25.5.bb b/recipes-containers/docker-compose/python3-docker-compose_1.25.5.bb deleted file mode 100644 index dece5daa..00000000 --- a/recipes-containers/docker-compose/python3-docker-compose_1.25.5.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Multi-container orchestration for Docker" -HOMEPAGE = "https://www.docker.com/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "a6f296957148e4c61b28fb324c27c966" -SRC_URI[sha256sum] = "7a2eb6d8173fdf408e505e6f7d497ac0b777388719542be9e49a0efd477a50c6" - -SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch \ - file://0001-setup.py-import-fastentrypoints.patch \ - " - -DEPENDS += "${PYTHON_PN}-fastentrypoints-native" - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-cached-property \ - ${PYTHON_PN}-certifi \ - ${PYTHON_PN}-chardet \ - ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-docker \ - ${PYTHON_PN}-docker-pycreds \ - ${PYTHON_PN}-dockerpty \ - ${PYTHON_PN}-docopt \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-jsonschema \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-paramiko \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-texttable \ - ${PYTHON_PN}-urllib3 \ - ${PYTHON_PN}-websocket-client \ -" diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.26.0.bb b/recipes-containers/docker-compose/python3-docker-compose_1.26.0.bb new file mode 100644 index 00000000..37c62e85 --- /dev/null +++ b/recipes-containers/docker-compose/python3-docker-compose_1.26.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Multi-container orchestration for Docker" +HOMEPAGE = "https://www.docker.com/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "f7d54de5db1f17322c09db8157bd160f" +SRC_URI[sha256sum] = "7e836102d139aca667d6af53f0f4d942c9459ec24d6dd4f0203d74359b0fd311" + +SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch \ + file://0001-setup.py-import-fastentrypoints.patch \ + " + +DEPENDS += "${PYTHON_PN}-fastentrypoints-native" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-cached-property \ + ${PYTHON_PN}-certifi \ + ${PYTHON_PN}-chardet \ + ${PYTHON_PN}-colorama \ + ${PYTHON_PN}-distro \ + ${PYTHON_PN}-docker \ + ${PYTHON_PN}-docker-pycreds \ + ${PYTHON_PN}-dockerpty \ + ${PYTHON_PN}-docopt \ + ${PYTHON_PN}-dotenv \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-jsonschema \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-paramiko \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-texttable \ + ${PYTHON_PN}-urllib3 \ + ${PYTHON_PN}-wcwidth \ + ${PYTHON_PN}-websocket-client \ +" -- cgit v1.2.3-54-g00ecf