All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Khem Raj" <raj.khem@gmail.com>
To: Martin Kelly <mkelly@xevo.com>
Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
Subject: Re: [oe] [meta-python][PATCH v2] python3-pint: upgrade 0.9 -> 0.11
Date: Wed, 25 Mar 2020 12:46:32 -0700	[thread overview]
Message-ID: <CAMKF1sp4Drht0XEi9qRB0GH1BmnguvkZZLvbfST3ETciP+2gpg@mail.gmail.com> (raw)
In-Reply-To: <1f54cb63-78ec-58fa-c430-b70dde91dbea@xevo.com>

On Wed, Mar 25, 2020 at 10:11 AM Martin Kelly <mkelly@xevo.com> wrote:
>
> On 3/25/20 9:59 AM, Khem Raj wrote:
> >
> >
> > On 3/25/20 9:48 AM, Martin Kelly wrote:
> >> Also add a dependency on python3-setuptools-scm-native to make this
> >> build with the newer version.
> >>
> >
> > Can you rebase it on master-next please ?
> >
>
> I just did, and it applies cleanly with no changes (applying on top of
> cfa5f5689: "python3-matplotlib: update to version 3.2.1"). Would you
> like me to send an identical v3 anyway?
>
> That aside, I will make sure to base future patches on master-next.
>


Description: [meta-python,v2] python3-pint: upgrade 0.9 -> 0.11
Applying: python3-pint: upgrade 0.9 -> 0.11
error: patch failed: meta-python/recipes-devtools/python/python-pint.inc:9
error: meta-python/recipes-devtools/python/python-pint.inc: patch does not apply
Patch failed at 0001 python3-pint: upgrade 0.9 -> 0.11
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128

> >> Signed-off-by: Martin Kelly <mkelly@xevo.com>
> >> ---
> >>   meta-python/recipes-devtools/python/python-pint.inc         | 6 ++++--
> >>   .../python/{python3-pint_0.9.bb => python3-pint_0.11.bb}    | 0
> >>   2 files changed, 4 insertions(+), 2 deletions(-)
> >>   rename meta-python/recipes-devtools/python/{python3-pint_0.9.bb =>
> >> python3-pint_0.11.bb} (100%)
> >>
> >> diff --git a/meta-python/recipes-devtools/python/python-pint.inc
> >> b/meta-python/recipes-devtools/python/python-pint.inc
> >> index 0900d91d7..4a9300900 100644
> >> --- a/meta-python/recipes-devtools/python/python-pint.inc
> >> +++ b/meta-python/recipes-devtools/python/python-pint.inc
> >> @@ -9,7 +9,9 @@ PYPI_PACKAGE := "Pint"
> >>   inherit pypi
> >> -SRC_URI[md5sum] = "d0681cb7cfaca9fc68ce7edab0d08d88"
> >> -SRC_URI[sha256sum] =
> >> "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2"
> >> +SRC_URI[md5sum] = "3a8f29c2a30efd35af4b5c5a224ef965"
> >> +SRC_URI[sha256sum] =
> >> "308f1070500e102f83b6adfca6db53debfce2ffc5d3cbe3f6c367da359b5cf4d"
> >> +
> >> +DEPENDS += "python3-setuptools-scm-native"
> >>   BBCLASSEXTEND = "native"
> >> diff --git a/meta-python/recipes-devtools/python/python3-pint_0.9.bb
> >> b/meta-python/recipes-devtools/python/python3-pint_0.11.bb
> >> similarity index 100%
> >> rename from meta-python/recipes-devtools/python/python3-pint_0.9.bb
> >> rename to meta-python/recipes-devtools/python/python3-pint_0.11.bb
> >>
> >>
> >>
> >>
> 

  reply	other threads:[~2020-03-25 19:47 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-25 16:48 [meta-python][PATCH v2] python3-pint: upgrade 0.9 -> 0.11 Martin Kelly
2020-03-25 16:59 ` [oe] " Khem Raj
2020-03-25 17:11   ` Martin Kelly
2020-03-25 19:46     ` Khem Raj [this message]
2020-03-25 19:59       ` Martin Kelly

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAMKF1sp4Drht0XEi9qRB0GH1BmnguvkZZLvbfST3ETciP+2gpg@mail.gmail.com \
    --to=raj.khem@gmail.com \
    --cc=mkelly@xevo.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.