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 --- .../0001-setup.py-remove-maximum-version-requirements.patch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch') 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, } -- cgit v1.2.3-54-g00ecf