* [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements
@ 2019-11-22 7:45 Chen Qi
2019-11-25 21:12 ` Bruce Ashfield
0 siblings, 1 reply; 5+ messages in thread
From: Chen Qi @ 2019-11-22 7:45 UTC (permalink / raw)
To: meta-virtualization
Remove maximum version requirements for docker-compose so that it
does not require old version recipes.
The current one has been tested against https://docs.docker.com/compose/gettingstarted/.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
...upport-newer-minor-version-of-reques.patch | 44 --------------
...-remove-maximum-version-requirements.patch | 58 +++++++++++++++++++
.../python3-docker-compose_1.21.2.bb | 2 +-
3 files changed, 59 insertions(+), 45 deletions(-)
delete mode 100644 recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
create mode 100644 recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
diff --git a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch b/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
deleted file mode 100644
index 48a6f25..0000000
--- a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b4655b5e7f1e5b87a758dfd7af01a49a40ed148a Mon Sep 17 00:00:00 2001
-From: Li Zhou <li.zhou@windriver.com>
-Date: Thu, 10 Oct 2019 15:46:20 +0800
-Subject: [PATCH] docker-compose: support newer minor version of requests
-
-Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
-
-Upstream-Status: Backport
-
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
----
- 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
-
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
new file mode 100644
index 0000000..54835ff
--- /dev/null
+++ b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
@@ -0,0 +1,58 @@
+From 2685716409c560cdf94aee6262ed8c32ad137133 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Fri, 22 Nov 2019 09:24:58 +0800
+Subject: [PATCH] setup.py: remove maximum version requirements
+
+Remove maximum version requirements so that docker-compose will not
+require old version recipes.
+
+Upstream-Status: Inappropriate [OE Specific]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ setup.py | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 422ba54..c2b4556 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,16 +30,16 @@ def find_version(*file_paths):
+
+
+ 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',
+- 'texttable >= 0.9.0, < 0.10',
+- 'websocket-client >= 0.32.0, < 1.0',
+- 'docker >= 3.3.0, < 4.0',
+- 'dockerpty >= 0.4.1, < 0.5',
+- 'six >= 1.3.0, < 2',
+- 'jsonschema >= 2.5.1, < 3',
++ 'cached-property >= 1.2.0',
++ 'docopt >= 0.6.1',
++ 'PyYAML >= 3.10',
++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
++ 'texttable >= 0.9.0',
++ 'websocket-client >= 0.32.0',
++ 'docker >= 3.3.0',
++ 'dockerpty >= 0.4.1',
++ 'six >= 1.3.0',
++ 'jsonschema >= 2.5.1',
+ ]
+
+
+@@ -56,7 +56,7 @@ extras_require = {
+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
+ ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
+ ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+ }
+
+
+--
+2.17.1
+
diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
index a7f7b1c..a895005 100644
--- a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
+++ b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
@@ -3,7 +3,7 @@ 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"
+SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch"
inherit pypi setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements
2019-11-22 7:45 [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements Chen Qi
@ 2019-11-25 21:12 ` Bruce Ashfield
2019-11-26 1:32 ` Chen Qi
0 siblings, 1 reply; 5+ messages in thread
From: Bruce Ashfield @ 2019-11-25 21:12 UTC (permalink / raw)
To: Chen Qi; +Cc: meta-virtualization
In message: [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements
on 22/11/2019 Chen Qi wrote:
> Remove maximum version requirements for docker-compose so that it
> does not require old version recipes.
Which oe-core versions of the packages are newer than the maximum values
listed in docer compose ?
I'd like to log that in this commit log .. since that is the justification
for the patch.
Bruce
>
> The current one has been tested against https://docs.docker.com/compose/gettingstarted/.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> ...upport-newer-minor-version-of-reques.patch | 44 --------------
> ...-remove-maximum-version-requirements.patch | 58 +++++++++++++++++++
> .../python3-docker-compose_1.21.2.bb | 2 +-
> 3 files changed, 59 insertions(+), 45 deletions(-)
> delete mode 100644 recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> create mode 100644 recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
>
> diff --git a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch b/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> deleted file mode 100644
> index 48a6f25..0000000
> --- a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -From b4655b5e7f1e5b87a758dfd7af01a49a40ed148a Mon Sep 17 00:00:00 2001
> -From: Li Zhou <li.zhou@windriver.com>
> -Date: Thu, 10 Oct 2019 15:46:20 +0800
> -Subject: [PATCH] docker-compose: support newer minor version of requests
> -
> -Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
> -
> -Upstream-Status: Backport
> -
> -Signed-off-by: Li Zhou <li.zhou@windriver.com>
> ----
> - 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
> -
> 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
> new file mode 100644
> index 0000000..54835ff
> --- /dev/null
> +++ b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
> @@ -0,0 +1,58 @@
> +From 2685716409c560cdf94aee6262ed8c32ad137133 Mon Sep 17 00:00:00 2001
> +From: Chen Qi <Qi.Chen@windriver.com>
> +Date: Fri, 22 Nov 2019 09:24:58 +0800
> +Subject: [PATCH] setup.py: remove maximum version requirements
> +
> +Remove maximum version requirements so that docker-compose will not
> +require old version recipes.
> +
> +Upstream-Status: Inappropriate [OE Specific]
> +
> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> +---
> + setup.py | 22 +++++++++++-----------
> + 1 file changed, 11 insertions(+), 11 deletions(-)
> +
> +diff --git a/setup.py b/setup.py
> +index 422ba54..c2b4556 100644
> +--- a/setup.py
> ++++ b/setup.py
> +@@ -30,16 +30,16 @@ def find_version(*file_paths):
> +
> +
> + 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',
> +- 'texttable >= 0.9.0, < 0.10',
> +- 'websocket-client >= 0.32.0, < 1.0',
> +- 'docker >= 3.3.0, < 4.0',
> +- 'dockerpty >= 0.4.1, < 0.5',
> +- 'six >= 1.3.0, < 2',
> +- 'jsonschema >= 2.5.1, < 3',
> ++ 'cached-property >= 1.2.0',
> ++ 'docopt >= 0.6.1',
> ++ 'PyYAML >= 3.10',
> ++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
> ++ 'texttable >= 0.9.0',
> ++ 'websocket-client >= 0.32.0',
> ++ 'docker >= 3.3.0',
> ++ 'dockerpty >= 0.4.1',
> ++ 'six >= 1.3.0',
> ++ 'jsonschema >= 2.5.1',
> + ]
> +
> +
> +@@ -56,7 +56,7 @@ extras_require = {
> + ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
> + ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
> + ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
> +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
> ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
> + }
> +
> +
> +--
> +2.17.1
> +
> diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
> index a7f7b1c..a895005 100644
> --- a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
> +++ b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
> @@ -3,7 +3,7 @@ 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"
> +SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch"
>
> inherit pypi setuptools3
>
> --
> 2.17.1
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
>
> View/Reply Online (#4733): https://lists.yoctoproject.org/g/meta-virtualization/message/4733
> Mute This Topic: https://lists.yoctoproject.org/mt/61564429/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements
2019-11-26 1:32 ` Chen Qi
@ 2019-11-26 1:21 ` Bruce Ashfield
2019-11-26 12:07 ` Ming Liu
0 siblings, 1 reply; 5+ messages in thread
From: Bruce Ashfield @ 2019-11-26 1:21 UTC (permalink / raw)
To: ChenQi; +Cc: meta-virtualization, Ming Liu
On Mon, Nov 25, 2019 at 8:17 PM ChenQi <Qi.Chen@windriver.com> wrote:
>
> On 11/26/2019 05:12 AM, Bruce Ashfield wrote:
>
> In message: [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements
> on 22/11/2019 Chen Qi wrote:
>
> Remove maximum version requirements for docker-compose so that it
> does not require old version recipes.
>
> Which oe-core versions of the packages are newer than the maximum values
> listed in docer compose ?
>
> I'd like to log that in this commit log .. since that is the justification
> for the patch.
>
> Bruce
>
>
> Hi Bruce,
>
> I've sent out V2 adding the information. Totally, it's 5 old recipes that are needed.
>
> @Ming, I hope your upgrade to 1.25 could also rebase on this patch if it's merged.
> Because meta-python usually upgrades the packages to latest versions, and we will soon meet the same problem.
>
> Bruce, I have communicated with docker-compose upstream, they have confirmed that they will not remove the maximum version constraints. See https://github.com/docker/compose/issues/7024.
>
thanks for the link, and the effort to get it resolved upstream!
I'll merge v2 shortly.
Bruce
> Best Regards,
> Chen Qi
>
> The current one has been tested against https://docs.docker.com/compose/gettingstarted/.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> ...upport-newer-minor-version-of-reques.patch | 44 --------------
> ...-remove-maximum-version-requirements.patch | 58 +++++++++++++++++++
> .../python3-docker-compose_1.21.2.bb | 2 +-
> 3 files changed, 59 insertions(+), 45 deletions(-)
> delete mode 100644 recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> create mode 100644 recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
>
> diff --git a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch b/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> deleted file mode 100644
> index 48a6f25..0000000
> --- a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -From b4655b5e7f1e5b87a758dfd7af01a49a40ed148a Mon Sep 17 00:00:00 2001
> -From: Li Zhou <li.zhou@windriver.com>
> -Date: Thu, 10 Oct 2019 15:46:20 +0800
> -Subject: [PATCH] docker-compose: support newer minor version of requests
> -
> -Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
> -
> -Upstream-Status: Backport
> -
> -Signed-off-by: Li Zhou <li.zhou@windriver.com>
> ----
> - 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
> -
> 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
> new file mode 100644
> index 0000000..54835ff
> --- /dev/null
> +++ b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
> @@ -0,0 +1,58 @@
> +From 2685716409c560cdf94aee6262ed8c32ad137133 Mon Sep 17 00:00:00 2001
> +From: Chen Qi <Qi.Chen@windriver.com>
> +Date: Fri, 22 Nov 2019 09:24:58 +0800
> +Subject: [PATCH] setup.py: remove maximum version requirements
> +
> +Remove maximum version requirements so that docker-compose will not
> +require old version recipes.
> +
> +Upstream-Status: Inappropriate [OE Specific]
> +
> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> +---
> + setup.py | 22 +++++++++++-----------
> + 1 file changed, 11 insertions(+), 11 deletions(-)
> +
> +diff --git a/setup.py b/setup.py
> +index 422ba54..c2b4556 100644
> +--- a/setup.py
> ++++ b/setup.py
> +@@ -30,16 +30,16 @@ def find_version(*file_paths):
> +
> +
> + 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',
> +- 'texttable >= 0.9.0, < 0.10',
> +- 'websocket-client >= 0.32.0, < 1.0',
> +- 'docker >= 3.3.0, < 4.0',
> +- 'dockerpty >= 0.4.1, < 0.5',
> +- 'six >= 1.3.0, < 2',
> +- 'jsonschema >= 2.5.1, < 3',
> ++ 'cached-property >= 1.2.0',
> ++ 'docopt >= 0.6.1',
> ++ 'PyYAML >= 3.10',
> ++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
> ++ 'texttable >= 0.9.0',
> ++ 'websocket-client >= 0.32.0',
> ++ 'docker >= 3.3.0',
> ++ 'dockerpty >= 0.4.1',
> ++ 'six >= 1.3.0',
> ++ 'jsonschema >= 2.5.1',
> + ]
> +
> +
> +@@ -56,7 +56,7 @@ extras_require = {
> + ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
> + ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
> + ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
> +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
> ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
> + }
> +
> +
> +--
> +2.17.1
> +
> diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
> index a7f7b1c..a895005 100644
> --- a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
> +++ b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
> @@ -3,7 +3,7 @@ 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"
> +SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch"
>
> inherit pypi setuptools3
>
> --
> 2.17.1
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
>
> View/Reply Online (#4733): https://lists.yoctoproject.org/g/meta-virtualization/message/4733
> Mute This Topic: https://lists.yoctoproject.org/mt/61564429/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
>
> View/Reply Online (#4745): https://lists.yoctoproject.org/g/meta-virtualization/message/4745
> Mute This Topic: https://lists.yoctoproject.org/mt/61564429/3618072
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [Qi.Chen@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements
2019-11-25 21:12 ` Bruce Ashfield
@ 2019-11-26 1:32 ` Chen Qi
2019-11-26 1:21 ` Bruce Ashfield
0 siblings, 1 reply; 5+ messages in thread
From: Chen Qi @ 2019-11-26 1:32 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization, liu.ming50
[-- Attachment #1: Type: text/plain, Size: 7732 bytes --]
On 11/26/2019 05:12 AM, Bruce Ashfield wrote:
> In message: [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements
> on 22/11/2019 Chen Qi wrote:
>
>> Remove maximum version requirements for docker-compose so that it
>> does not require old version recipes.
> Which oe-core versions of the packages are newer than the maximum values
> listed in docer compose ?
>
> I'd like to log that in this commit log .. since that is the justification
> for the patch.
>
> Bruce
Hi Bruce,
I've sent out V2 adding the information. Totally, it's 5 old recipes
that are needed.
@Ming, I hope your upgrade to 1.25 could also rebase on this patch if
it's merged.
Because meta-python usually upgrades the packages to latest versions,
and we will soon meet the same problem.
Bruce, I have communicated with docker-compose upstream, they have
confirmed that they will not remove the maximum version constraints. See
https://github.com/docker/compose/issues/7024.
Best Regards,
Chen Qi
>> The current one has been tested against https://docs.docker.com/compose/gettingstarted/.
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>> ...upport-newer-minor-version-of-reques.patch | 44 --------------
>> ...-remove-maximum-version-requirements.patch | 58 +++++++++++++++++++
>> .../python3-docker-compose_1.21.2.bb | 2 +-
>> 3 files changed, 59 insertions(+), 45 deletions(-)
>> delete mode 100644 recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
>> create mode 100644 recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
>>
>> diff --git a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch b/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
>> deleted file mode 100644
>> index 48a6f25..0000000
>> --- a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
>> +++ /dev/null
>> @@ -1,44 +0,0 @@
>> -From b4655b5e7f1e5b87a758dfd7af01a49a40ed148a Mon Sep 17 00:00:00 2001
>> -From: Li Zhou <li.zhou@windriver.com>
>> -Date: Thu, 10 Oct 2019 15:46:20 +0800
>> -Subject: [PATCH] docker-compose: support newer minor version of requests
>> -
>> -Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
>> -
>> -Upstream-Status: Backport
>> -
>> -Signed-off-by: Li Zhou <li.zhou@windriver.com>
>> ----
>> - 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
>> -
>> 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
>> new file mode 100644
>> index 0000000..54835ff
>> --- /dev/null
>> +++ b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
>> @@ -0,0 +1,58 @@
>> +From 2685716409c560cdf94aee6262ed8c32ad137133 Mon Sep 17 00:00:00 2001
>> +From: Chen Qi <Qi.Chen@windriver.com>
>> +Date: Fri, 22 Nov 2019 09:24:58 +0800
>> +Subject: [PATCH] setup.py: remove maximum version requirements
>> +
>> +Remove maximum version requirements so that docker-compose will not
>> +require old version recipes.
>> +
>> +Upstream-Status: Inappropriate [OE Specific]
>> +
>> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> +---
>> + setup.py | 22 +++++++++++-----------
>> + 1 file changed, 11 insertions(+), 11 deletions(-)
>> +
>> +diff --git a/setup.py b/setup.py
>> +index 422ba54..c2b4556 100644
>> +--- a/setup.py
>> ++++ b/setup.py
>> +@@ -30,16 +30,16 @@ def find_version(*file_paths):
>> +
>> +
>> + 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',
>> +- 'texttable >= 0.9.0, < 0.10',
>> +- 'websocket-client >= 0.32.0, < 1.0',
>> +- 'docker >= 3.3.0, < 4.0',
>> +- 'dockerpty >= 0.4.1, < 0.5',
>> +- 'six >= 1.3.0, < 2',
>> +- 'jsonschema >= 2.5.1, < 3',
>> ++ 'cached-property >= 1.2.0',
>> ++ 'docopt >= 0.6.1',
>> ++ 'PyYAML >= 3.10',
>> ++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
>> ++ 'texttable >= 0.9.0',
>> ++ 'websocket-client >= 0.32.0',
>> ++ 'docker >= 3.3.0',
>> ++ 'dockerpty >= 0.4.1',
>> ++ 'six >= 1.3.0',
>> ++ 'jsonschema >= 2.5.1',
>> + ]
>> +
>> +
>> +@@ -56,7 +56,7 @@ extras_require = {
>> + ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
>> + ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
>> + ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
>> +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
>> ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
>> + }
>> +
>> +
>> +--
>> +2.17.1
>> +
>> diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
>> index a7f7b1c..a895005 100644
>> --- a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
>> +++ b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
>> @@ -3,7 +3,7 @@ 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"
>> +SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch"
>>
>> inherit pypi setuptools3
>>
>> --
>> 2.17.1
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>>
>> View/Reply Online (#4733): https://lists.yoctoproject.org/g/meta-virtualization/message/4733
>> Mute This Topic: https://lists.yoctoproject.org/mt/61564429/1050810
>> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
>> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
>
> View/Reply Online (#4745): https://lists.yoctoproject.org/g/meta-virtualization/message/4745
> Mute This Topic: https://lists.yoctoproject.org/mt/61564429/3618072
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [Qi.Chen@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
[-- Attachment #2: Type: text/html, Size: 10476 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements
2019-11-26 1:21 ` Bruce Ashfield
@ 2019-11-26 12:07 ` Ming Liu
0 siblings, 0 replies; 5+ messages in thread
From: Ming Liu @ 2019-11-26 12:07 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: ChenQi, meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 8641 bytes --]
Hi, Chen Qi:
Arha, good point, will rebase my patch and also add some change logs in
commit as Bruce requested, thanks.
the best,
thank you
Bruce Ashfield <bruce.ashfield@gmail.com> 於 2019年11月26日 週二 上午2:21寫道：
> On Mon, Nov 25, 2019 at 8:17 PM ChenQi <Qi.Chen@windriver.com> wrote:
> >
> > On 11/26/2019 05:12 AM, Bruce Ashfield wrote:
> >
> > In message: [meta-virtualization][PATCH] python3-docker-compose: remove
> maximum version requirements
> > on 22/11/2019 Chen Qi wrote:
> >
> > Remove maximum version requirements for docker-compose so that it
> > does not require old version recipes.
> >
> > Which oe-core versions of the packages are newer than the maximum values
> > listed in docer compose ?
> >
> > I'd like to log that in this commit log .. since that is the
> justification
> > for the patch.
> >
> > Bruce
> >
> >
> > Hi Bruce,
> >
> > I've sent out V2 adding the information. Totally, it's 5 old recipes
> that are needed.
> >
> > @Ming, I hope your upgrade to 1.25 could also rebase on this patch if
> it's merged.
> > Because meta-python usually upgrades the packages to latest versions,
> and we will soon meet the same problem.
> >
> > Bruce, I have communicated with docker-compose upstream, they have
> confirmed that they will not remove the maximum version constraints. See
> https://github.com/docker/compose/issues/7024.
> >
>
> thanks for the link, and the effort to get it resolved upstream!
>
> I'll merge v2 shortly.
>
> Bruce
>
> > Best Regards,
> > Chen Qi
> >
> > The current one has been tested against
> https://docs.docker.com/compose/gettingstarted/.
> >
> > Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> > ---
> > ...upport-newer-minor-version-of-reques.patch | 44 --------------
> > ...-remove-maximum-version-requirements.patch | 58 +++++++++++++++++++
> > .../python3-docker-compose_1.21.2.bb | 2 +-
> > 3 files changed, 59 insertions(+), 45 deletions(-)
> > delete mode 100644
> recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> > create mode 100644
> recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
> >
> > diff --git
> a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> b/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> > deleted file mode 100644
> > index 48a6f25..0000000
> > ---
> a/recipes-containers/docker-compose/files/0001-docker-compose-support-newer-minor-version-of-reques.patch
> > +++ /dev/null
> > @@ -1,44 +0,0 @@
> > -From b4655b5e7f1e5b87a758dfd7af01a49a40ed148a Mon Sep 17 00:00:00 2001
> > -From: Li Zhou <li.zhou@windriver.com>
> > -Date: Thu, 10 Oct 2019 15:46:20 +0800
> > -Subject: [PATCH] docker-compose: support newer minor version of requests
> > -
> > -Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
> > -
> > -Upstream-Status: Backport
> > -
> > -Signed-off-by: Li Zhou <li.zhou@windriver.com>
> > ----
> > - 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
> > -
> > 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
> > new file mode 100644
> > index 0000000..54835ff
> > --- /dev/null
> > +++
> b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
> > @@ -0,0 +1,58 @@
> > +From 2685716409c560cdf94aee6262ed8c32ad137133 Mon Sep 17 00:00:00 2001
> > +From: Chen Qi <Qi.Chen@windriver.com>
> > +Date: Fri, 22 Nov 2019 09:24:58 +0800
> > +Subject: [PATCH] setup.py: remove maximum version requirements
> > +
> > +Remove maximum version requirements so that docker-compose will not
> > +require old version recipes.
> > +
> > +Upstream-Status: Inappropriate [OE Specific]
> > +
> > +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> > +---
> > + setup.py | 22 +++++++++++-----------
> > + 1 file changed, 11 insertions(+), 11 deletions(-)
> > +
> > +diff --git a/setup.py b/setup.py
> > +index 422ba54..c2b4556 100644
> > +--- a/setup.py
> > ++++ b/setup.py
> > +@@ -30,16 +30,16 @@ def find_version(*file_paths):
> > +
> > +
> > + 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',
> > +- 'texttable >= 0.9.0, < 0.10',
> > +- 'websocket-client >= 0.32.0, < 1.0',
> > +- 'docker >= 3.3.0, < 4.0',
> > +- 'dockerpty >= 0.4.1, < 0.5',
> > +- 'six >= 1.3.0, < 2',
> > +- 'jsonschema >= 2.5.1, < 3',
> > ++ 'cached-property >= 1.2.0',
> > ++ 'docopt >= 0.6.1',
> > ++ 'PyYAML >= 3.10',
> > ++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
> > ++ 'texttable >= 0.9.0',
> > ++ 'websocket-client >= 0.32.0',
> > ++ 'docker >= 3.3.0',
> > ++ 'dockerpty >= 0.4.1',
> > ++ 'six >= 1.3.0',
> > ++ 'jsonschema >= 2.5.1',
> > + ]
> > +
> > +
> > +@@ -56,7 +56,7 @@ extras_require = {
> > + ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
> > + ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
> > + ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
> > +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
> > ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
> > + }
> > +
> > +
> > +--
> > +2.17.1
> > +
> > diff --git a/recipes-containers/docker-compose/
> python3-docker-compose_1.21.2.bb b/recipes-containers/docker-compose/
> python3-docker-compose_1.21.2.bb
> > index a7f7b1c..a895005 100644
> > --- a/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
> > +++ b/recipes-containers/docker-compose/python3-docker-compose_1.21.2.bb
> > @@ -3,7 +3,7 @@ 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"
> > +SRC_URI +=
> "file://0001-setup.py-remove-maximum-version-requirements.patch"
> >
> > inherit pypi setuptools3
> >
> > --
> > 2.17.1
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> >
> > View/Reply Online (#4733):
> https://lists.yoctoproject.org/g/meta-virtualization/message/4733
> > Mute This Topic: https://lists.yoctoproject.org/mt/61564429/1050810
> > Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> > Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
> [bruce.ashfield@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> >
> > View/Reply Online (#4745):
> https://lists.yoctoproject.org/g/meta-virtualization/message/4745
> > Mute This Topic: https://lists.yoctoproject.org/mt/61564429/3618072
> > Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> > Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
> [Qi.Chen@windriver.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
> >
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
[-- Attachment #2: Type: text/html, Size: 12684 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-26 12:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-22 7:45 [meta-virtualization][PATCH] python3-docker-compose: remove maximum version requirements Chen Qi
2019-11-25 21:12 ` Bruce Ashfield
2019-11-26 1:32 ` Chen Qi
2019-11-26 1:21 ` Bruce Ashfield
2019-11-26 12:07 ` Ming Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.