Patchwork [meta-oe,v2,2/2] python-numpy : Correct difflib dependency.

login
register
mail settings
Submitter Dan McDougall
Date June 6, 2012, 3:20 p.m.
Message ID <1338996004-32583-2-git-send-email-daniel.mcdougall@liftoffsoftware.com>
Download mbox | patch
Permalink /patch/29315/
State New, archived
Headers show

Comments

Dan McDougall - June 6, 2012, 3:20 p.m.
The previous patch had python-diffutils when it should have been
python-difflib.

Signed-off-by: Dan McDougall <daniel.mcdougall@liftoffsoftware.com>
---
 .../recipes-devtools/python/python-numpy_1.4.1.bb  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Gary Thomas - June 6, 2012, 3:27 p.m.
On 2012-06-06 09:20, Dan McDougall wrote:
> The previous patch had python-diffutils when it should have been
> python-difflib.
>
> Signed-off-by: Dan McDougall<daniel.mcdougall@liftoffsoftware.com>
> ---
>   .../recipes-devtools/python/python-numpy_1.4.1.bb  |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> index bae624e..702f224 100644
> --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> +++ b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> @@ -26,6 +26,6 @@ SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b"
>   SRC_URI[sha256sum] = "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06"
>
>   RDEPENDS_${PN} = "python-unittest \
> -                  python-diffutils \
> +                  python-difflib \
>                     python-pprint \
>                    "

Since these patches have not yet been accepted/merged, shouldn't
you squash them into one?
Martin Jansa - June 6, 2012, 3:30 p.m.
On Wed, Jun 06, 2012 at 09:27:18AM -0600, Gary Thomas wrote:
> On 2012-06-06 09:20, Dan McDougall wrote:
> > The previous patch had python-diffutils when it should have been
> > python-difflib.
> >
> > Signed-off-by: Dan McDougall<daniel.mcdougall@liftoffsoftware.com>
> > ---
> >   .../recipes-devtools/python/python-numpy_1.4.1.bb  |    2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> > index bae624e..702f224 100644
> > --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> > +++ b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> > @@ -26,6 +26,6 @@ SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b"
> >   SRC_URI[sha256sum] = "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06"
> >
> >   RDEPENDS_${PN} = "python-unittest \
> > -                  python-diffutils \
> > +                  python-difflib \
> >                     python-pprint \
> >                    "
> 
> Since these patches have not yet been accepted/merged, shouldn't
> you squash them into one?

Once again:

http://git.openembedded.org/meta-openembedded/commit/?id=036eb620206041bf1cf4be5a8c2a4947afb34382
Martin Jansa - June 6, 2012, 3:32 p.m.
On Wed, Jun 06, 2012 at 09:27:18AM -0600, Gary Thomas wrote:
> On 2012-06-06 09:20, Dan McDougall wrote:
> > The previous patch had python-diffutils when it should have been
> > python-difflib.
> >
> > Signed-off-by: Dan McDougall<daniel.mcdougall@liftoffsoftware.com>
> > ---
> >   .../recipes-devtools/python/python-numpy_1.4.1.bb  |    2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> > index bae624e..702f224 100644
> > --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> > +++ b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> > @@ -26,6 +26,6 @@ SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b"
> >   SRC_URI[sha256sum] = "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06"
> >
> >   RDEPENDS_${PN} = "python-unittest \
> > -                  python-diffutils \
> > +                  python-difflib \
> >                     python-pprint \
> >                    "
> 
> Since these patches have not yet been accepted/merged, shouldn't
> you squash them into one?

And interestingly someone found completely different set of deps a while
ago..

http://patchwork.openembedded.org/patch/3011/

Cheers,
Dan McDougall - June 6, 2012, 4:33 p.m.
On Wed, Jun 6, 2012 at 11:32 AM, Martin Jansa <martin.jansa@gmail.com>wrote:

> On Wed, Jun 06, 2012 at 09:27:18AM -0600, Gary Thomas wrote:
> > On 2012-06-06 09:20, Dan McDougall wrote:
> > > The previous patch had python-diffutils when it should have been
> > > python-difflib.
> > >
> > > Signed-off-by: Dan McDougall<daniel.mcdougall@liftoffsoftware.com>
> > > ---
> > >   .../recipes-devtools/python/python-numpy_1.4.1.bb  |    2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bbb/meta-oe/recipes-devtools/python/
> python-numpy_1.4.1.bb
> > > index bae624e..702f224 100644
> > > --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> > > +++ b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
> > > @@ -26,6 +26,6 @@ SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b"
> > >   SRC_URI[sha256sum] =
> "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06"
> > >
> > >   RDEPENDS_${PN} = "python-unittest \
> > > -                  python-diffutils \
> > > +                  python-difflib \
> > >                     python-pprint \
> > >                    "
> >
> > Since these patches have not yet been accepted/merged, shouldn't
> > you squash them into one?
>
> And interestingly someone found completely different set of deps a while
> ago..
>
> http://patchwork.openembedded.org/patch/3011/
>
> Cheers,
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
Well, Koen already committed my previous patch so I submitted the difflib
fix for that.  I included it as a 2/2 for context (not sure if that's the
right thing to do).

As for that other patch's dependencies, they're not correct:  I have numpy
installed on my Beaglebone right now and it works great without
python-mmap, python-compiler, python-pydoc, or python-pkgutil.
 python-unittest is definitely required though but that's in my patch
already.
Philip Balister - June 6, 2012, 11:43 p.m.
On 06/06/2012 12:33 PM, Daniel McDougall wrote:
> On Wed, Jun 6, 2012 at 11:32 AM, Martin Jansa <martin.jansa@gmail.com>wrote:
> 
>> On Wed, Jun 06, 2012 at 09:27:18AM -0600, Gary Thomas wrote:
>>> On 2012-06-06 09:20, Dan McDougall wrote:
>>>> The previous patch had python-diffutils when it should have been
>>>> python-difflib.
>>>>
>>>> Signed-off-by: Dan McDougall<daniel.mcdougall@liftoffsoftware.com>
>>>> ---
>>>>   .../recipes-devtools/python/python-numpy_1.4.1.bb  |    2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bbb/meta-oe/recipes-devtools/python/
>> python-numpy_1.4.1.bb
>>>> index bae624e..702f224 100644
>>>> --- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
>>>> +++ b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
>>>> @@ -26,6 +26,6 @@ SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b"
>>>>   SRC_URI[sha256sum] =
>> "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06"
>>>>
>>>>   RDEPENDS_${PN} = "python-unittest \
>>>> -                  python-diffutils \
>>>> +                  python-difflib \
>>>>                     python-pprint \
>>>>                    "
>>>
>>> Since these patches have not yet been accepted/merged, shouldn't
>>> you squash them into one?
>>
>> And interestingly someone found completely different set of deps a while
>> ago..
>>
>> http://patchwork.openembedded.org/patch/3011/
>>
>> Cheers,
>>
>> --
>> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>
>>
> Well, Koen already committed my previous patch so I submitted the difflib
> fix for that.  I included it as a 2/2 for context (not sure if that's the
> right thing to do).
> 
> As for that other patch's dependencies, they're not correct:  I have numpy
> installed on my Beaglebone right now and it works great without
> python-mmap, python-compiler, python-pydoc, or python-pkgutil.
>  python-unittest is definitely required though but that's in my patch
> already.
> 

I wonder if you take a different path through numpy, will it import some
additional python modules?

Philip
Dan McDougall - June 7, 2012, 1:36 a.m.
On Wed, Jun 6, 2012 at 7:43 PM, Philip Balister <philip@balister.org> wrote:
>
>
> I wonder if you take a different path through numpy, will it import some
> additional python modules?
>

I don't think so.  I ran through a bunch of tests with my python-numpy
package and all went well.  I didn't encounter any errors.  Given, I didn't
test *everything* :)

Patch

diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
index bae624e..702f224 100644
--- a/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
+++ b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
@@ -26,6 +26,6 @@  SRC_URI[md5sum] = "5c7b5349dc3161763f7f366ceb96516b"
 SRC_URI[sha256sum] = "2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06"
 
 RDEPENDS_${PN} = "python-unittest \
-                  python-diffutils \
+                  python-difflib \
                   python-pprint \
                  "