* [meta-python][PATCH v2] python3-pint: upgrade 0.9 -> 0.11
@ 2020-03-25 16:48 Martin Kelly
2020-03-25 16:59 ` [oe] " Khem Raj
0 siblings, 1 reply; 5+ messages in thread
From: Martin Kelly @ 2020-03-25 16:48 UTC (permalink / raw)
To: openembedded-devel; +Cc: Martin Kelly
Also add a dependency on python3-setuptools-scm-native to make this
build with the newer version.
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
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [oe] [meta-python][PATCH v2] python3-pint: upgrade 0.9 -> 0.11
2020-03-25 16:48 [meta-python][PATCH v2] python3-pint: upgrade 0.9 -> 0.11 Martin Kelly
@ 2020-03-25 16:59 ` Khem Raj
2020-03-25 17:11 ` Martin Kelly
0 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2020-03-25 16:59 UTC (permalink / raw)
To: Martin Kelly, openembedded-devel
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 ?
> 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
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe] [meta-python][PATCH v2] python3-pint: upgrade 0.9 -> 0.11
2020-03-25 16:59 ` [oe] " Khem Raj
@ 2020-03-25 17:11 ` Martin Kelly
2020-03-25 19:46 ` Khem Raj
0 siblings, 1 reply; 5+ messages in thread
From: Martin Kelly @ 2020-03-25 17:11 UTC (permalink / raw)
To: Khem Raj, openembedded-devel
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.
>> 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
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe] [meta-python][PATCH v2] python3-pint: upgrade 0.9 -> 0.11
2020-03-25 17:11 ` Martin Kelly
@ 2020-03-25 19:46 ` Khem Raj
2020-03-25 19:59 ` Martin Kelly
0 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2020-03-25 19:46 UTC (permalink / raw)
To: Martin Kelly; +Cc: openembeded-devel
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
> >>
> >>
> >>
> >>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe] [meta-python][PATCH v2] python3-pint: upgrade 0.9 -> 0.11
2020-03-25 19:46 ` Khem Raj
@ 2020-03-25 19:59 ` Martin Kelly
0 siblings, 0 replies; 5+ messages in thread
From: Martin Kelly @ 2020-03-25 19:59 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On 3/25/20 12:46 PM, Khem Raj wrote:
> 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
>
I see now, it appears that git am is pickier about auto-merging than git
rebase is, as it's failing while git rebase worked fine. I sent a v3
rebased onto master-next, and I confirmed that git am succeeds.
>>>> 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
>>>>
>>>>
>>>>
>>>>
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-25 19:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2020-03-25 19:59 ` Martin Kelly
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.