[meta-virtualization] [PATCH] python-docker-pycreds & python-docker: Add recipe for python2
Bruce Ashfield
bruce.ashfield at gmail.com
Sat Feb 2 19:47:49 PST 2019
The problem is .. the patch doesn't cleanly cherry pick to sumo. There
are conflicts.
----------
build [/home/bruc...ualization]> git cherry-pick
cbefd4d88c0878c259c53c02a61b713679379124
error: could not apply cbefd4d... add the py2 version for
python-docker and python-docker-pycreds packages
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
build [/home/bruc...ualization]> git status
On branch sumo
Your branch is up to date with 'origin/sumo'.
You are currently cherry-picking commit cbefd4d.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
new file: recipes-devtools/python/python-docker-pycreds.inc
new file: recipes-devtools/python/python-docker-pycreds_0.3.0.bb
new file: recipes-devtools/python/python-docker.inc
new file: recipes-devtools/python/python-docker_3.4.0.bb
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: recipes-devtools/python/python3-docker-pycreds_0.2.1.bb
both modified: recipes-devtools/python/python3-docker_2.5.1.bb
----------------
The conflicts aren't that bad, but I'm not setup to test sumo at the
moment, so I'd rather if someone working on that branch do the fixups
and send the patch.
i.e. I'd need a sumo specific patch generated and sent to the list.
Cheers,
Bruce
On Thu, Jan 31, 2019 at 3:14 AM david bensoussan <minipada at gmail.com> wrote:
>
> I would need it for sumo. Could you cherry pick it and add it there?
>
> On Wed, 30 Jan 2019, 08:04 Bruce Ashfield, <bruce.ashfield at gmail.com> wrote:
>>
>> What branch is this for ? The following is already on master:
>>
>> commit cbefd4d88c0878c259c53c02a61b713679379124
>> Author: Ting Yu <tyu at cisco.com>
>> 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 <bruce.ashfield at windriver.com>
>>
>> :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 <minipada at gmail.com> 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
>> > meta-virtualization at yoctoproject.org
>> > 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
>
> --
>
> David Bensoussan
> Robotique / Ingénieur logiciel embarqué
>
> ________________________________
>
> Synapticon | Systèmes de contrôle robotiques
>
> mobile:004915779804515/0033659971070
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
More information about the meta-virtualization
mailing list