python3-docker-compose: uprev 1.25.5 > 1.26.0
PATCH 1/1 python3-docker-compose: uprev 1.25.5 > 1.26.0
From: Ming Liu <[email protected]>
The major changes include:d4451659 Bump 1.26.03d94f442 Bump 1.26.0-rc51386a855 Merge pull request #7485 from ulyssessouza/fix-https-daemon 8034c96d Bump docker-py48d09369 Fix flake8 errors28bf47ce Pin wcwidth==0.1.9d279b7a8 Bump 1.26.0-rc483371df2 Merge branch 'master' into 1.26.x9c5351cf Merge pull request #7389 from ulyssessouza/general-bumps-for-1_26 836e2b7c General bumps266d287e Merge pull request #7390 from ulyssessouza/remove-unused-resources d64f3f39 Remove unused files4e310a94 Merge pull request #7386 from ulyssessouza/bump-python-dotenv-1_13_0 d52b51e8 Bump python-dotenv from 0.11.0 to 0.13.064a6a48b 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.pyb7d6dc79 Bump certifi from 2019.11.28 to 2020.4.5.1c22a2510 Merge pull request #7374 from ulyssessouza/fix-distro-guess a62a1e1d Add "distro" packageafc5d205 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
---
...tup.py-remove-maximum-version-requirements.patch | 13 +++++++++----
...e_1.25.5.bb => python3-docker-compose_1.26.0.bb} | 7 +++++--
2 files changed, 14 insertions(+), 6 deletions(-)
rename recipes-containers/docker-compose/{python3-docker-compose_1.25.5.bb => python3-docker-compose_1.26.0.bb} (81%)recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch +9 -4
@@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Chen Qi <[email protected]> Signed-off-by: Ming Liu <[email protected]> --- - 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, }
recipes-containers/docker-compose/python3-docker-compose_1.26.0.bb renamed from recipes-containers/docker-compose/python3-docker-compose_1.25.5.bb +5 -2
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" inherit pypi setuptools3 -SRC_URI[md5sum] = "a6f296957148e4c61b28fb324c27c966" -SRC_URI[sha256sum] = "7a2eb6d8173fdf408e505e6f7d497ac0b777388719542be9e49a0efd477a50c6" +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 \
@@ -19,10 +19,12 @@ RDEPENDS_${PN} = "\ ${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 \
@@ -34,5 +36,6 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-terminal \ ${PYTHON_PN}-texttable \ ${PYTHON_PN}-urllib3 \ + ${PYTHON_PN}-wcwidth \ ${PYTHON_PN}-websocket-client \ "
Signature · 1 line
2.27.0