[matplotlib-devel] Location of bleeding edge repository

2011-03-07 Thread Paul Hobson
Is it in git or svn? I just cloned and installed from git using: git clone git://github.com/astraw/matplotlib.git cd matplotlib sudo python setupegg.py develop Starting ipython, and importing matplotlib, I get: In [2]: matplotlib.__version__ Out[2]: '1.0.0' I thought v1.0.1 was available. Should

Re: [matplotlib-devel] Merging instructions

2011-03-07 Thread Jouni K . Seppänen
Eric Firing writes: >> https://github.com/matplotlib/matplotlib/pull/17 > > This brings up something that confuses me, together with related > questions, and so might be another topic for this part of the docs: > > 1) How is it that you were able to add commits to a branch of someone > else's f

Re: [matplotlib-devel] Problems with new PyQt4 API

2011-03-07 Thread Benjamin Root
On Mon, Mar 7, 2011 at 10:39 AM, Darren Dale wrote: > On Mon, Mar 7, 2011 at 11:24 AM, Benjamin Root wrote: > > > > > > On Mon, Mar 7, 2011 at 10:20 AM, Darren Dale wrote: > >> > >> On Mon, Mar 7, 2011 at 11:04 AM, Benjamin Root wrote: > >> > > >> > > >> > On Fri, Mar 4, 2011 at 4:23 AM, Marti

Re: [matplotlib-devel] Merging instructions

2011-03-07 Thread Eric Firing
On 03/07/2011 10:30 AM, Jouni K. Seppänen wrote: >>> 5. v1.0.x doesn't merge cleanly into master >> >> What do you mean by this? What is the symptom? > > A merge conflict or (probably much less often) a test failure, because > v1.0.x and master have diverged in the relevant part. An example is pu

Re: [matplotlib-devel] Merging instructions

2011-03-07 Thread Jouni K . Seppänen
Eric Firing writes: >> git pull --ff-only upstream v1.0.x >> >> (This assumes an "upstream" remote pointing to >> `git://github.com/matplotlib/matplotlib.git`.) Then merge your pull > > By default, however, if you have cloned from > g...@github.com:matplotlib/matplotlib.git then instead of

Re: [matplotlib-devel] Merging instructions

2011-03-07 Thread Darren Dale
On Mon, Mar 7, 2011 at 3:14 PM, Eric Firing wrote: > On 03/07/2011 09:36 AM, Jouni K. Seppänen wrote: >> I just wrote this as a response to a question on >> https://github.com/matplotlib/matplotlib/pull/32 >> about how to merge to v1.0.x and master. >> >> Please feel free to comment or ask for det

Re: [matplotlib-devel] Merging instructions

2011-03-07 Thread Darren Dale
Hi Jouni, Thanks for doing this... On Mon, Mar 7, 2011 at 2:36 PM, Jouni K. Seppänen wrote: > I just wrote this as a response to a question on > https://github.com/matplotlib/matplotlib/pull/32 > about how to merge to v1.0.x and master. > > Please feel free to comment or ask for details. > > ---

Re: [matplotlib-devel] Merging instructions

2011-03-07 Thread Eric Firing
On 03/07/2011 09:36 AM, Jouni K. Seppänen wrote: > I just wrote this as a response to a question on > https://github.com/matplotlib/matplotlib/pull/32 > about how to merge to v1.0.x and master. > > Please feel free to comment or ask for details. > > -

[matplotlib-devel] Merging instructions

2011-03-07 Thread Jouni K . Seppänen
I just wrote this as a response to a question on https://github.com/matplotlib/matplotlib/pull/32 about how to merge to v1.0.x and master. Please feel free to comment or ask for details. -- First make sure your v1.0.x bra

Re: [matplotlib-devel] Problems with new PyQt4 API

2011-03-07 Thread Darren Dale
On Mon, Mar 7, 2011 at 11:24 AM, Benjamin Root wrote: > > > On Mon, Mar 7, 2011 at 10:20 AM, Darren Dale wrote: >> >> On Mon, Mar 7, 2011 at 11:04 AM, Benjamin Root wrote: >> > >> > >> > On Fri, Mar 4, 2011 at 4:23 AM, Martin Teichmann >> > >> > wrote: >> >> >> >> Hi Ben, Hi list, >> >> >> >> >

Re: [matplotlib-devel] Problems with new PyQt4 API

2011-03-07 Thread Benjamin Root
On Mon, Mar 7, 2011 at 10:20 AM, Darren Dale wrote: > On Mon, Mar 7, 2011 at 11:04 AM, Benjamin Root wrote: > > > > > > On Fri, Mar 4, 2011 at 4:23 AM, Martin Teichmann < > lkb.teichm...@gmail.com> > > wrote: > >> > >> Hi Ben, Hi list, > >> > >> > Exactly. That's all I found too. Nothing indic

Re: [matplotlib-devel] Problems with new PyQt4 API

2011-03-07 Thread Darren Dale
On Mon, Mar 7, 2011 at 11:04 AM, Benjamin Root wrote: > > > On Fri, Mar 4, 2011 at 4:23 AM, Martin Teichmann > wrote: >> >> Hi Ben, Hi list, >> >> > Exactly.  That's all I found too.  Nothing indicates that we need to >> > change anything.  We are throwing away the second part of the tuple >> > w

Re: [matplotlib-devel] Problems with new PyQt4 API

2011-03-07 Thread Benjamin Root
On Fri, Mar 4, 2011 at 4:23 AM, Martin Teichmann wrote: > Hi Ben, Hi list, > > > Exactly. That's all I found too. Nothing indicates that we need to > > change anything. We are throwing away the second part of the tuple > > which has the returned filter. The only reason I see for the new > > fu

Re: [matplotlib-devel] buggy legend behavior with "_nolegend_" label?

2011-03-07 Thread Benjamin Root
On Sun, Mar 6, 2011 at 7:18 AM, Jae-Joon Lee wrote: > Hi, > > According to the legend doc, > >If label is set to '_nolegend_', the item will not be shown in >legend. > > But I think the documented behavior a bit ambiguous. For example, > consider the example below. > >l1, = plot([1,2,