[meta-virtualization] [PATCH] python3-docker-compose: upgrade to 1.21.2

[Bach, Pascal]

> while updating a project to 2.6 (thud) I encountered a problem running
> docker-compose: The image builds and boots up without problems. But once
> we try to run docker-compose on the target it complains that the python3-
> docker version does not fit.
> 
> - Seemingly docker-compose (recipes-containers/docker-compose/python3-
> docker-compose_1.16.1.bb) expects a python3-docker version ranging from
> 2.5.1 to 3.0.
> - Since the included python3-docker version is 3.4.0 (recipes-
> devtools/python/python3-docker_3.4.0.bb) this is out of range and leads to
> docker-compose complaining.
> 
> So it seems to be a problem with python package versions not fitting inside
> the meta-virtualization layer. Not being a python expert, but I was able to fix
> this with updating python3-docker-compose to 1.21.2. Also had to adapt
> Pascal Bachs patch to fix the requests version (not sure if patching a patch is
> the way to go…).

Best would be to test if the new version restriction works and then submit the change upstream.

Is there a reason you did update to 1.21.2 and not 1.24.0?

> Please excuse the patch format, git send-email is not available to me right
> now.
> 
> 
> diff --git a/recipes-containers/docker-compose/files/0001-Allow-newer-
> versions-of-requests.patch b/recipes-containers/docker-
> compose/files/0001-Allow-newer-versions-of-requests.patch
> index 6fc7bb4..e3329fe 100644
> --- a/recipes-containers/docker-compose/files/0001-Allow-newer-versions-
> of-requests.patch
> +++ b/recipes-containers/docker-compose/files/0001-Allow-newer-
> versions-
> +++ of-requests.patch
> @@ -22,8 +22,8 @@ index 192a0f6..f444757 100644
>       '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',
> -+    'requests >= 2.6.1, != 2.11.0',
> +-    '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',
>       'texttable >= 0.9.0, < 0.10',
>       'websocket-client >= 0.32.0, < 1.0',
>       'docker >= 2.5.1, < 3.0',
> diff --git a/recipes-containers/docker-compose/python3-docker-
> compose_1.16.1.bb b/recipes-containers/docker-compose/python3-docker-
> compose_1.21.2.bb
> similarity index 84%
> rename from recipes-containers/docker-compose/python3-docker-
> compose_1.16.1.bb
> rename to recipes-containers/docker-compose/python3-docker-
> compose_1.21.2.bb
> index 851c251..b251af9 100644
> --- a/recipes-containers/docker-compose/python3-docker-
> compose_1.16.1.bb
> +++ b/recipes-containers/docker-compose/python3-docker-
> compose_1.21.2.bb
> @@ -7,8 +7,8 @@ SRC_URI += "file://0001-Allow-newer-versions-of-
> requests.patch"
> 
>  inherit pypi setuptools3
> 
> -SRC_URI[md5sum] = "8dcadf09143600fcb573b43f446c8f9a"
> -SRC_URI[sha256sum] =
> "fb46a6a2c4d193a3ff1e4d7208eea920b629c81dc92257c87f3f93095cfb0bdf"
> +SRC_URI[md5sum] = "a243f59b2d286c41ff6ed1c4d4b50996"
> +SRC_URI[sha256sum] =
> "68b07193755440d5f8d4f47e6f3484212afc255d5b785a81353ea1e9298c1c2c"
> 
>  RDEPENDS_${PN} = "\
>    ${PYTHON_PN}-cached-property \
> 
> 
> Best regards,
> Christoph Stein
> 
> 
> SAMSON AKTIENGESELLSCHAFT
> Sitz der Gesellschaft: Frankfurt am Main
> Registergericht: Amtsgericht Frankfurt am Main, Nr. HRB 7131 Vorsitzender
> des Aufsichtsrates: Dr. Nikolaus Hensel
> Vorstand: Dr. Andreas Widl (Vors.), Raul Fuchs, Dr. Ingo Koch, Dr. Thomas
> Steckenreiter
> 
> Der Inhalt dieser Nachricht ist vertraulich und nur für den angegebenen
> Empfänger bestimmt.
> Jede Form der Kenntnisnahme durch Dritte oder der Weitergabe an Dritte ist
> unzulässig.
> Sollte diese Nachricht nicht für Sie bestimmt sein, so bitten wir Sie, sich mit
> uns per E-Mail oder telefonisch in Verbindung zu setzen.
> 
> 
> SAMSON AKTIENGESELLSCHAFT
> Registered Office: Frankfurt am Main
> Court of registration: Local District Court Frankfurt am Main, no. HRB 7131
> Chairman of the Supervisory Board: Dr. Nikolaus Hensel Executive Board: Dr.
> Andreas Widl (Chairman), Raul Fuchs, Dr. Ingo Koch, Dr. Thomas
> Steckenreiter
> 
> The content of this message is confidential and intended only for the
> recipient indicated.
> Taking notice of this message or disclosure by third parties is not permitted.
> In the event that this message is not intended for you, please contact us via
> e-mail or phone.
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization