From 74e0b8d2acc6b9bbc0345a500a700932d70772f4 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Fri, 30 Oct 2020 20:14:44 -0300 Subject: python3-docker-compose: upgrade 1.26.0 to 1.27.4 Release notes for 1.27.4: - Bugs - Remove path checks for bind mounts - Fix port rendering to output long form syntax for non-v1 - Add protocol to the docker socket address Release notes for 1.27.3: - Bugs - Merged max_replicas_per_node on docker-compose config. - Fixed depends_on serialization on docker-compose config. - Fixed scaling when some containers are not running on docker-compose up. - Enabled relative paths for driver_opts.device for local driver. - Allowed strings for cpus fields. Release notes for 1.27.2: - Bugs - Fix bug on docker-compose run container attach Release notes for 1.27.1: - Bugs - Fix compose run when service.scale is specified - Allow driver property for external networks as temporary workaround for swarm network propagation issue - Pin new internal schema version to 3.9 as the default - Preserve the version when configured in the compose file Release notes for 1.27.0: - Features - Merge 2.x and 3.x compose formats and align with COMPOSE_SPEC schema - Implement service mode for ipc - Pass COMPOSE_PROJECT_NAME environment variable in container mode - Make run behave in the same way as up - Use docker build on docker-compose run when COMPOSE_DOCKER_CLI_BUILD environment variable is set - Use docker-py default API version for engine queries (auto) - Parse network_mode on build - Bugs - Ignore build context path validation when building is not required - Fix float to bytes conversion via docker-py bump to 4.3.1 - Fix scale bug when deploy section is set - Fix docker-py bump in setup.py - Fix experimental build failure detection - Fix context propagation to docker cli - Miscellaneous - Drop support for Python 2.7 - Add script for docs syncronization - Bump docker-py to 4.3.1 - Bump tox to 3.19.0 - Bump virtualenv to 20.0.30 Release notes for 1.26.2: - Bugs - Enforce docker-py 4.2.2 as minimum version when installing with pip Release notes for 1.26.1: - Features - Bump docker-py from 4.2.1 to 4.2.2 - Bugs - Enforce docker-py 4.2.1 as minimum version when installing with pip - Fix context load for non-docker endpoints Signed-off-by: Ricardo Salveti Signed-off-by: Bruce Ashfield --- ...up.py-remove-maximum-version-requirements.patch | 25 ++++++------- .../python3-docker-compose_1.26.0.bb | 41 ---------------------- .../python3-docker-compose_1.27.4.bb | 41 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 55 deletions(-) delete mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.26.0.bb create mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.27.4.bb 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 f517d05a..2c25f69d 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 @@ -1,4 +1,4 @@ -From 1d358acd46c9ca71d848fca8c2d677414257f247 Mon Sep 17 00:00:00 2001 +From e3aca6421e003d03d119e69bf3d6b30bb5c662c9 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 22 Nov 2019 09:24:58 +0800 Subject: [PATCH] setup.py: remove maximum version requirements @@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Chen Qi Signed-off-by: Ming Liu --- - setup.py | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) + setup.py | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/setup.py b/setup.py -index 110441dc..eef28254 100644 +index e0d4340e..80ffefe5 100644 --- a/setup.py +++ b/setup.py -@@ -30,18 +30,18 @@ def find_version(*file_paths): +@@ -25,17 +25,17 @@ def find_version(*file_paths): install_requires = [ @@ -29,9 +29,8 @@ index 110441dc..eef28254 100644 - 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', - 'distro >= 1.5.0, < 2', -- 'docker[ssh] >= 3.7.0, < 5', +- 'docker[ssh] >= 4.3.1, < 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', @@ -41,24 +40,22 @@ index 110441dc..eef28254 100644 + 'texttable >= 0.9.0', + 'websocket-client >= 0.32.0', + 'distro >= 1.5.0', -+ 'docker[ssh] >= 3.7.0', ++ 'docker[ssh] >= 4.3.1', + 'dockerpty >= 0.4.1', -+ 'six >= 1.3.0', + 'jsonschema >= 2.5.1', + 'python-dotenv >= 0.13.0', ] -@@ -61,7 +61,7 @@ extras_require = { - ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', - 'ipaddress >= 1.0.16, < 2'], +@@ -51,7 +51,7 @@ if sys.version_info[:2] < (3, 4): + extras_require = { + ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], ':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, } - -- -2.25.0 +2.28.0 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 deleted file mode 100644 index 37c62e85..00000000 --- a/recipes-containers/docker-compose/python3-docker-compose_1.26.0.bb +++ /dev/null @@ -1,41 +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] = "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 \ -" diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.27.4.bb b/recipes-containers/docker-compose/python3-docker-compose_1.27.4.bb new file mode 100644 index 00000000..1096d31d --- /dev/null +++ b/recipes-containers/docker-compose/python3-docker-compose_1.27.4.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] = "6c25d3b92596dc529edc337cc837eae1" +SRC_URI[sha256sum] = "5a5690f24c27d4b43dcbe6b3fae91ba680713208e99ee863352b3bae37bcaa83" + +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