What branch is this for ? The following is already on master:

commit cbefd4d88c0878c259c53c02a61b713679379124
Author: Ting Yu <[email protected]>
Date:   Thu Dec 13 20:41:04 2018 +0000

    add the py2 version for python-docker and python-docker-pycreds packages

    add the py2 version for python-docker and python-docker-pycreds packages.
    add python-six and python-backport_ssl (for ph2 only) as
python-docker dependencies.

    verify the connection to docker engine at run time -
    >>> import docker
    >>> client = docker.from_env()
    >>> client.images.list()
    [<Image: 'hello-world:latest'>]

    Signed-off-by: Bruce Ashfield <[email protected]>

:000000 100644 0000000 ca0995f A
recipes-devtools/python/python-docker-pycreds.inc

Which obviously will conflict with the python-docker-pycreds.inc that
you have below.

Cheers,

Bruce

On Fri, Jan 25, 2019 at 8:19 AM David Bensoussan <[email protected]> wrote:
>
> ---
>  recipes-devtools/python/python-docker-pycreds.inc   |  7 +++++++
>  .../python/python-docker-pycreds_0.2.1.bb           |  3 +++
>  recipes-devtools/python/python-docker.inc           |  5 +++++
>  recipes-devtools/python/python-docker_2.5.1.bb      | 11 +++++++++++
>  .../python/python3-docker-pycreds_0.2.1.bb          |  8 +-------
>  recipes-devtools/python/python3-docker_2.5.1.bb     | 13 +++----------
>  6 files changed, 30 insertions(+), 17 deletions(-)
>  create mode 100644 recipes-devtools/python/python-docker-pycreds.inc
>  create mode 100644 recipes-devtools/python/python-docker-pycreds_0.2.1.bb
>  create mode 100644 recipes-devtools/python/python-docker.inc
>  create mode 100644 recipes-devtools/python/python-docker_2.5.1.bb
>
> diff --git a/recipes-devtools/python/python-docker-pycreds.inc 
> b/recipes-devtools/python/python-docker-pycreds.inc
> new file mode 100644
> index 0000000..e76267d
> --- /dev/null
> +++ b/recipes-devtools/python/python-docker-pycreds.inc
> @@ -0,0 +1,7 @@
> +SUMMARY = "Python bindings for the docker credentials store API"
> +HOMEPAGE = "https://github.com/shin-/dockerpy-creds";
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> +
> +SRC_URI[md5sum] = "0d80d5aebab771faf7e422b759c3055b"
> +SRC_URI[sha256sum] = 
> "93833a2cf280b7d8abbe1b8121530413250c6cd4ffed2c1cf085f335262f7348"
> diff --git a/recipes-devtools/python/python-docker-pycreds_0.2.1.bb 
> b/recipes-devtools/python/python-docker-pycreds_0.2.1.bb
> new file mode 100644
> index 0000000..f6ddc8d
> --- /dev/null
> +++ b/recipes-devtools/python/python-docker-pycreds_0.2.1.bb
> @@ -0,0 +1,3 @@
> +inherit pypi setuptools
> +
> +require python-docker-pycreds.inc
> diff --git a/recipes-devtools/python/python-docker.inc 
> b/recipes-devtools/python/python-docker.inc
> new file mode 100644
> index 0000000..f23b537
> --- /dev/null
> +++ b/recipes-devtools/python/python-docker.inc
> @@ -0,0 +1,5 @@
> +SRC_URI[md5sum] = "7d917152976df075e6e90ee853df641f"
> +SRC_URI[sha256sum] = 
> "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880"
> +
> +DEPENDS += "${PYTHON_PN}-pip-native"
> +
> diff --git a/recipes-devtools/python/python-docker_2.5.1.bb 
> b/recipes-devtools/python/python-docker_2.5.1.bb
> new file mode 100644
> index 0000000..9dc83e8
> --- /dev/null
> +++ b/recipes-devtools/python/python-docker_2.5.1.bb
> @@ -0,0 +1,11 @@
> +inherit pypi setuptools
> +
> +RDEPENDS_${PN} += " \
> +       python-backports-ssl \
> +       python-docker-pycreds \
> +       python-requests \
> +       python-websocket-client \
> +"
> +
> +require python-docker.inc
> +
> diff --git a/recipes-devtools/python/python3-docker-pycreds_0.2.1.bb 
> b/recipes-devtools/python/python3-docker-pycreds_0.2.1.bb
> index 4038410..52423d2 100644
> --- a/recipes-devtools/python/python3-docker-pycreds_0.2.1.bb
> +++ b/recipes-devtools/python/python3-docker-pycreds_0.2.1.bb
> @@ -1,9 +1,3 @@
> -SUMMARY = "Python bindings for the docker credentials store API"
> -HOMEPAGE = "https://github.com/shin-/dockerpy-creds";
> -LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> -
>  inherit pypi setuptools3
>
> -SRC_URI[md5sum] = "0d80d5aebab771faf7e422b759c3055b"
> -SRC_URI[sha256sum] = 
> "93833a2cf280b7d8abbe1b8121530413250c6cd4ffed2c1cf085f335262f7348"
> +require python-docker-pycreds.inc
> diff --git a/recipes-devtools/python/python3-docker_2.5.1.bb 
> b/recipes-devtools/python/python3-docker_2.5.1.bb
> index 341d95c..0dca028 100644
> --- a/recipes-devtools/python/python3-docker_2.5.1.bb
> +++ b/recipes-devtools/python/python3-docker_2.5.1.bb
> @@ -1,17 +1,10 @@
> -SUMMARY = "A Python library for the Docker Engine API."
> -HOMEPAGE = "https://github.com/docker/docker-py";
> -LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=34f3846f940453127309b920eeb89660"
> -
>  inherit pypi setuptools3
>
> -SRC_URI[md5sum] = "7d917152976df075e6e90ee853df641f"
> -SRC_URI[sha256sum] = 
> "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880"
> -
> -DEPENDS += "${PYTHON_PN}-pip-native"
> -
>  RDEPENDS_${PN} += " \
>         python3-docker-pycreds \
>         python3-requests \
>         python3-websocket-client \
>  "
> +
> +require python-docker.inc
> +
> --
> 2.17.1
>
> --
> _______________________________________________
> meta-virtualization mailing list
> [email protected]
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-- 
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Reply via email to