docker-compose: uprev to 1.25.0
PATCH 1/1 docker-compose: uprev to 1.25.0
From: Ming Liu <[email protected]>
--- ...docker-compose-compatible-with-PyYAML-5.3.patch | 36 ++++++++++++++++++ ...ose-support-newer-minor-version-of-reques.patch | 44 ---------------------- .../python3-docker-compose_1.21.2.bb | 31 --------------- .../python3-docker-compose_1.25.0.bb | 34 +++++++++++++++++ 4 files changed, 70 insertions(+), 75 deletions(-) create mode 100644 recipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch delete mode 100644 recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch delete mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb create mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.25.0.bb
recipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 10e9b0accbfef93f7d26d1cd470545ad64e370ff Mon Sep 17 00:00:00 2001 +From: Ming Liu <[email protected]> +Date: Mon, 25 Nov 2019 13:53:11 +0100 +Subject: [PATCH] Make docker-compose compatible with PyYAML < 5.3. + +Upstream is not yet using PyYAML 5.1 as they are waiting for the +final 5.2 release (due api differences that does not affect compose), +so make it compatible with PyYAML < 5.3 as OE now ships with 5.1.2. + +Derives from: +https://github.com/foundriesio/meta-lmp/commit/117d2d73b9e982dec25f24a2665a1b03a040412f + +Upstream-Status: Inappropriate [OE specific] + +Ricardo Salveti <[email protected]> +Signed-off-by: Ming Liu <[email protected]> +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 23ae08a..8a5f5d0 100644 +--- a/setup.py ++++ b/setup.py +@@ -32,7 +32,7 @@ def find_version(*file_paths): + install_requires = [ + 'cached-property >= 1.2.0, < 2', + 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 5', ++ 'PyYAML >= 3.10, < 5.3', + 'requests >= 2.20.0, < 3', + 'texttable >= 0.9.0, < 2', + 'websocket-client >= 0.32.0, < 1', +-- +2.7.4 +
recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch deleted +0 -44
44 lines not on this page · raw message
recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb deleted +0 -31
@@ -1,31 +0,0 @@ -SUMMARY = "Multi-container orchestration for Docker" -HOMEPAGE = "https://www.docker.com/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" - -SRC_URI += "file://0001-docker-compose-support-newer-minor-version-of-reques.patch" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "a243f59b2d286c41ff6ed1c4d4b50996" -SRC_URI[sha256sum] = "68b07193755440d5f8d4f47e6f3484212afc255d5b785a81353ea1e9298c1c2c" - -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}-idna \ - ${PYTHON_PN}-jsonschema \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-texttable \ - ${PYTHON_PN}-urllib3 \ - ${PYTHON_PN}-websocket-client \ - "
recipes-containers/docker-compose/python3-docker-compose_1.25.0.bb new file +34 -0
@@ -0,0 +1,34 @@ +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] = "275b32cffdad6b9816dc8b4c7e55600a" +SRC_URI[sha256sum] = "2c5fcbfd3ff445b6f3eebb549cb167ef1d8f70c5806aab8f309fc8fa74cd977e" + +SRC_URI += "file://0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch" + +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 \ +"
Signature · 1 line
2.7.4
Quoted 2 lines · Ming Liu
From: Ming Liu <[email protected]>
Can we get a summary of the changes between the revisions here in the long log ? It's useful to have in the git history.
Quoted 7 lines
Signed-off-by Ming Liu <[email protected]>--- ...docker-compose-compatible-with-PyYAML-5.3.patch | 36 ++++++++++++++++++ ...ose-support-newer-minor-version-of-reques.patch | 44 ---------------------- .../python3-docker-compose_1.21.2.bb | 31 --------------- .../python3-docker-compose_1.25.0.bb | 34 +++++++++++++++++
Can you regenerate the patch with -M ? That way we can easily see if there are any deltas in the recipe itself.
Quoted 17 lines
4 files changed, 70 insertions(+), 75 deletions(-) create mode 100644 recipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch delete mode 100644 recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch delete mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb create mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.25.0.bbrecipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch new file +5
-0@@ -0,0 +1,36 @@ +From 10e9b0accbfef93f7d26d1cd470545ad64e370ff Mon Sep 17 00:00:00 2001 +From: Ming Liu <[email protected]> +Date: Mon, 25 Nov 2019 13:53:11 +0100 +Subject: [PATCH] Make docker-compose compatible with PyYAML < 5.3. +
recipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch line 15
Quoted 10 lines
recipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch new file +10
-0+Upstream is not yet using PyYAML 5.1 as they are waiting for the +final 5.2 release (due api differences that does not affect compose), +so make it compatible with PyYAML < 5.3 as OE now ships with 5.1.2. + +Derives from: +https://github.com/foundriesio/meta-lmp/commit/117d2d73b9e982dec25f24a2665a1b03a040412f + +Upstream-Status: Inappropriate [OE specific] + +Ricardo Salveti <[email protected]>
You mentioned above that the change "derives from" .. If this isn't exactly the patch, then don't add someone else's Signed-off-by. You've already given credit by linking to the upstream patch, so you don't need the signed-off-by.
Bruce
Quoted 159 lines
recipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch new file +21
-0+Signed-off-by: Ming Liu <[email protected]> +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 23ae08a..8a5f5d0 100644 +--- a/setup.py ++++ b/setup.py +@@ -32,7 +32,7 @@ def find_version(*file_paths): + install_requires = [ + 'cached-property >= 1.2.0, < 2', + 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 5', ++ 'PyYAML >= 3.10, < 5.3', + 'requests >= 2.20.0, < 3', + 'texttable >= 0.9.0, < 2', + 'websocket-client >= 0.32.0, < 1', +-- +2.7.4 +recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch deleted +0
-44@@ -1,44 +0,0 @@ -From b4655b5e7f1e5b87a758dfd7af01a49a40ed148a Mon Sep 17 00:00:00 2001 -From: Li Zhou <[email protected]> -Date: Thu, 10 Oct 2019 15:46:20 +0800 -Subject: [PATCH] docker-compose: support newer minor version of requests - -Signed-off-by: Ofek Lev <[email protected]> - -Upstream-Status: Backport - -Signed-off-by: Li Zhou <[email protected]> ---- - requirements.txt | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 93a0cce..42bde41 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -16,7 +16,7 @@ pypiwin32==219; sys_platform == 'win32' and python_version < '3.6' - pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6' - PySocks==1.6.7 - PyYAML==3.12 --requests==2.18.4 -+requests==2.19.1 - six==1.10.0 - texttable==0.9.1 - urllib3==1.21.1 -diff --git a/setup.py b/setup.py -index 422ba54..a74ee0f 100644 ---- a/setup.py -+++ b/setup.py -@@ -33,7 +33,7 @@ install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 0.7', - 'PyYAML >= 3.10, < 4', -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', -+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.20', - 'texttable >= 0.9.0, < 0.10', - 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 3.3.0, < 4.0', --- -1.9.1 -recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb deleted +0
-31@@ -1,31 +0,0 @@ -SUMMARY = "Multi-container orchestration for Docker" -HOMEPAGE = "https://www.docker.com/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" - -SRC_URI += "file://0001-docker-compose-support-newer-minor-version-of-reques.patch" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "a243f59b2d286c41ff6ed1c4d4b50996" -SRC_URI[sha256sum] = "68b07193755440d5f8d4f47e6f3484212afc255d5b785a81353ea1e9298c1c2c" - -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}-idna \ - ${PYTHON_PN}-jsonschema \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-texttable \ - ${PYTHON_PN}-urllib3 \ - ${PYTHON_PN}-websocket-client \ - "recipes-containers/docker-compose/python3-docker-compose_1.25.0.bb new file +34
-1@@ -0,0 +1,34 @@ +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] = "275b32cffdad6b9816dc8b4c7e55600a" +SRC_URI[sha256sum] = "2c5fcbfd3ff445b6f3eebb549cb167ef1d8f70c5806aab8f309fc8fa74cd977e" + +SRC_URI += "file://0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch" + +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 \ +" --2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.View/Reply Online (#4739): https://lists.yoctoproject.org/g/meta-virtualization/message/4739
Mute This Topic: https://lists.yoctoproject.org/mt/61947254/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
1.25.0 requires new version of python3-docker.
Best Regards,
Chen Qi
Quoted 193 lines · Ming Liu
From: Ming Liu <[email protected]>
Signed-off-by Ming Liu <[email protected]>--- ...docker-compose-compatible-with-PyYAML-5.3.patch | 36 ++++++++++++++++++ ...ose-support-newer-minor-version-of-reques.patch | 44 ---------------------- .../python3-docker-compose_1.21.2.bb | 31 --------------- .../python3-docker-compose_1.25.0.bb | 34 +++++++++++++++++ 4 files changed, 70 insertions(+), 75 deletions(-)create mode 100644
recipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patchdelete mode 100644recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patchdelete mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
create mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.25.0.bbrecipes-containers/docker-compose/files/0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch new file +36
-0@@ -0,0 +1,36 @@ +From 10e9b0accbfef93f7d26d1cd470545ad64e370ff Mon Sep 17 00:00:00 2001 +From: Ming Liu <[email protected]> +Date: Mon, 25 Nov 2019 13:53:11 +0100 +Subject: [PATCH] Make docker-compose compatible with PyYAML < 5.3. + +Upstream is not yet using PyYAML 5.1 as they are waiting for the +final 5.2 release (due api differences that does not affect compose), +so make it compatible with PyYAML < 5.3 as OE now ships with 5.1.2. + +Derives from: +https://github.com/foundriesio/meta-lmp/commit/117d2d73b9e982dec25f24a2665a1b03a040412f + +Upstream-Status: Inappropriate [OE specific] + +Ricardo Salveti <[email protected]> +Signed-off-by: Ming Liu <[email protected]> +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 23ae08a..8a5f5d0 100644 +--- a/setup.py ++++ b/setup.py +@@ -32,7 +32,7 @@ def find_version(*file_paths): + install_requires = [ + 'cached-property >= 1.2.0, < 2', + 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 5', ++ 'PyYAML >= 3.10, < 5.3', + 'requests >= 2.20.0, < 3', + 'texttable >= 0.9.0, < 2', + 'websocket-client >= 0.32.0, < 1', +-- +2.7.4 +recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch deleted +0
-44@@ -1,44 +0,0 @@ -From b4655b5e7f1e5b87a758dfd7af01a49a40ed148a Mon Sep 17 00:00:00 2001 -From: Li Zhou <[email protected]> -Date: Thu, 10 Oct 2019 15:46:20 +0800 -Subject: [PATCH] docker-compose: support newer minor version of requests - -Signed-off-by: Ofek Lev <[email protected]> - -Upstream-Status: Backport - -Signed-off-by: Li Zhou <[email protected]> ---- - requirements.txt | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 93a0cce..42bde41 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -16,7 +16,7 @@ pypiwin32==219; sys_platform == 'win32' and python_version < '3.6' - pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6' - PySocks==1.6.7 - PyYAML==3.12 --requests==2.18.4 -+requests==2.19.1 - six==1.10.0 - texttable==0.9.1 - urllib3==1.21.1 -diff --git a/setup.py b/setup.py -index 422ba54..a74ee0f 100644 ---- a/setup.py -+++ b/setup.py -@@ -33,7 +33,7 @@ install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 0.7', - 'PyYAML >= 3.10, < 4', -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', -+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.20', - 'texttable >= 0.9.0, < 0.10', - 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 3.3.0, < 4.0', --- -1.9.1 -recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb deleted +0
-31@@ -1,31 +0,0 @@ -SUMMARY = "Multi-container orchestration for Docker" -HOMEPAGE = "https://www.docker.com/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" - -SRC_URI += "file://0001-docker-compose-support-newer-minor-version-of-reques.patch" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "a243f59b2d286c41ff6ed1c4d4b50996" -SRC_URI[sha256sum] = "68b07193755440d5f8d4f47e6f3484212afc255d5b785a81353ea1e9298c1c2c" - -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}-idna \ - ${PYTHON_PN}-jsonschema \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-texttable \ - ${PYTHON_PN}-urllib3 \ - ${PYTHON_PN}-websocket-client \ - "recipes-containers/docker-compose/python3-docker-compose_1.25.0.bb new file +34
-1@@ -0,0 +1,34 @@ +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] = "275b32cffdad6b9816dc8b4c7e55600a" +SRC_URI[sha256sum] = "2c5fcbfd3ff445b6f3eebb549cb167ef1d8f70c5806aab8f309fc8fa74cd977e" + +SRC_URI += "file://0001-Make-docker-compose-compatible-with-PyYAML-5.3.patch" + +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 \ +" -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#4739): https://lists.yoctoproject.org/g/meta-virtualization/message/4739
Mute This Topic: https://lists.yoctoproject.org/mt/61947254/3618072
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-