sorry for the delay, I was waiting to see if anyone else had comments and then forgot to loop back to this!
The change looks good to me, and tested ok in my setup. This is now merged. Bruce On Thu, Dec 13, 2018 at 3:41 PM Ting Yu <[email protected]> wrote: > > 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'>] > > --- > recipes-devtools/python/python-docker-pycreds.inc | 7 +++++++ > recipes-devtools/python/python-docker-pycreds_0.3.0.bb | 3 +++ > recipes-devtools/python/python-docker.inc | 14 ++++++++++++++ > recipes-devtools/python/python-docker_3.4.0.bb | 6 ++++++ > recipes-devtools/python/python3-docker-pycreds_0.3.0.bb | 8 +------- > recipes-devtools/python/python3-docker_3.4.0.bb | 16 +--------------- > 6 files changed, 32 insertions(+), 22 deletions(-) > create mode 100644 recipes-devtools/python/python-docker-pycreds.inc > create mode 100644 recipes-devtools/python/python-docker-pycreds_0.3.0.bb > create mode 100644 recipes-devtools/python/python-docker.inc > create mode 100644 recipes-devtools/python/python-docker_3.4.0.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..ca0995f > --- /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] = "2370ea3b62198b788a26231ab58844af" > +SRC_URI[sha256sum] = > "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff" > diff --git a/recipes-devtools/python/python-docker-pycreds_0.3.0.bb > b/recipes-devtools/python/python-docker-pycreds_0.3.0.bb > new file mode 100644 > index 0000000..6dc4521 > --- /dev/null > +++ b/recipes-devtools/python/python-docker-pycreds_0.3.0.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..eec7cda > --- /dev/null > +++ b/recipes-devtools/python/python-docker.inc > @@ -0,0 +1,14 @@ > +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" > + > +SRC_URI[md5sum] = "02491d168c048cdb99cc20d0b352ea0f" > +SRC_URI[sha256sum] = > "e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7" > + > +RDEPENDS_${PN} += " \ > + ${PYTHON_PN}-six \ > + ${PYTHON_PN}-docker-pycreds \ > + ${PYTHON_PN}-requests \ > + ${PYTHON_PN}-websocket-client \ > +" > diff --git a/recipes-devtools/python/python-docker_3.4.0.bb > b/recipes-devtools/python/python-docker_3.4.0.bb > new file mode 100644 > index 0000000..a964254 > --- /dev/null > +++ b/recipes-devtools/python/python-docker_3.4.0.bb > @@ -0,0 +1,6 @@ > +inherit pypi setuptools > +require python-docker.inc > + > +RDEPENDS_${PN} += " \ > + python-backports-ssl \ > + " > diff --git a/recipes-devtools/python/python3-docker-pycreds_0.3.0.bb > b/recipes-devtools/python/python3-docker-pycreds_0.3.0.bb > index 4d39f52..75a83e0 100644 > --- a/recipes-devtools/python/python3-docker-pycreds_0.3.0.bb > +++ b/recipes-devtools/python/python3-docker-pycreds_0.3.0.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 > +require python-docker-pycreds.inc > > -SRC_URI[md5sum] = "2370ea3b62198b788a26231ab58844af" > -SRC_URI[sha256sum] = > "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff" > diff --git a/recipes-devtools/python/python3-docker_3.4.0.bb > b/recipes-devtools/python/python3-docker_3.4.0.bb > index 6e81302..052cbe8 100644 > --- a/recipes-devtools/python/python3-docker_3.4.0.bb > +++ b/recipes-devtools/python/python3-docker_3.4.0.bb > @@ -1,17 +1,3 @@ > -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] = "02491d168c048cdb99cc20d0b352ea0f" > -SRC_URI[sha256sum] = > "e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7" > - > DEPENDS += "${PYTHON_PN}-pip-native" > - > -RDEPENDS_${PN} += " \ > - python3-docker-pycreds \ > - python3-requests \ > - python3-websocket-client \ > -" > +require python-docker.inc > -- > 2.7.4 > > -- > _______________________________________________ > 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
