Re: [matplotlib-devel] v1.0.x branch seems confused

On Fri, Jun 3, 2011 at 9:04 AM, Benjamin Root wrote: > > > Plus, with regards to timing. Do we want to release before or after the > upcoming SciPy conference in July? Depending on who will be there > (unfortunately, I won't be), we might want to wait for after that conference > to take advanta

Re: [matplotlib-devel] v1.0.x branch seems confused

On Fri, Jun 3, 2011 at 10:04 AM, Benjamin Root wrote: > On Fri, Jun 3, 2011 at 3:39 AM, John Hunter wrote: >> >> On Thu, Jun 2, 2011 at 9:06 PM, Darren Dale wrote: >>> >>> Before we made the git transition, I read about various workflows. >>> What we are doing now is somewhat similar to what use

Re: [matplotlib-devel] v1.0.x branch seems confused

On Fri, Jun 3, 2011 at 3:39 AM, John Hunter wrote: > On Thu, Jun 2, 2011 at 9:06 PM, Darren Dale wrote: > >> Before we made the git transition, I read about various workflows. >> What we are doing now is somewhat similar to what used to be done with >> svnmerge. I just googled "git workflow", an

Re: [matplotlib-devel] v1.0.x branch seems confused

On Fri, Jun 3, 2011 at 8:50 AM, Ryan May wrote: > On Fri, Jun 3, 2011 at 3:39 AM, John Hunter wrote: > > On the animations issue, I have noticed one strange behavior when I tried > to > > remove the gtk extension code and replace it with pure python and found > the > > new animations API behaved

Re: [matplotlib-devel] v1.0.x branch seems confused

Well if you need to rip it out/"temporarily" break it to improve the > gtk backend, by all means do so. I'll be bogged down for a few more > months, after which I'll be able to work more on it. (FINALLY.) The > only reason I even checked it in originally was so that others could > play, but I was (

Re: [matplotlib-devel] v1.0.x branch seems confused

On Fri, Jun 3, 2011 at 3:39 AM, John Hunter wrote: > On the animations issue, I have noticed one strange behavior when I tried to > remove the gtk extension code and replace it with pure python and found the > new animations API behaved strangely (but not the old) under the new code. > I never com

Re: [matplotlib-devel] v1.0.x branch seems confused

On Fri, Jun 3, 2011 at 4:39 AM, John Hunter wrote: > On Thu, Jun 2, 2011 at 9:06 PM, Darren Dale wrote: >> >> Before we made the git transition, I read about various workflows. >> What we are doing now is somewhat similar to what used to be done with >> svnmerge. I just googled "git workflow", an

Re: [matplotlib-devel] v1.0.x branch seems confused

On Wed, Jun 1, 2011 at 2:58 PM, Eric Firing wrote: > Do the packagers use the tip of the maintenance branch, or do they use > the most recent release? If the former, then that bumps up the priority > of keeping such a branch. If the latter, it bumps up the priority of > having frequent high-qua

Re: [matplotlib-devel] v1.0.x branch seems confused

On Thu, Jun 2, 2011 at 9:06 PM, Darren Dale wrote: > Before we made the git transition, I read about various workflows. > What we are doing now is somewhat similar to what used to be done with > svnmerge. I just googled "git workflow", and found > http://www.kernel.org/pub/software/scm/git/docs/g

Re: [matplotlib-devel] v1.0.x branch seems confused

Thu, 02 Jun 2011 17:48:55 -0400, Darren Dale wrote: [clip] > * "git reset --hard 0e6dad5230" > * redo pull request 103 > * cherry-pick the following commits off of the v1.0.x branch: > - 069c21d > - 53f8139e > - de18d9ab2 > - 91e7d980 > - 0cc213b4fa > - e7f1e83ace > - 5c968a0ecdd > >

Re: [matplotlib-devel] v1.0.x branch seems confused

Hi, On Thu, Jun 2, 2011 at 7:06 PM, Darren Dale wrote: > Matthew, > > On Thu, Jun 2, 2011 at 8:17 PM, Matthew Brett wrote: >> Hi, >> >> On Thu, Jun 2, 2011 at 5:07 PM, Darren Dale wrote: >>> On Thu, Jun 2, 2011 at 7:46 PM, Eric Firing wrote: >> ... Even without the foulup, I think you wou

Re: [matplotlib-devel] v1.0.x branch seems confused

Matthew, On Thu, Jun 2, 2011 at 8:17 PM, Matthew Brett wrote: > Hi, > > On Thu, Jun 2, 2011 at 5:07 PM, Darren Dale wrote: >> On Thu, Jun 2, 2011 at 7:46 PM, Eric Firing wrote: > ... >>> Even without the foulup, I think you would see that the merges from >>> maintenance branches into subsequent

Re: [matplotlib-devel] v1.0.x branch seems confused

Hi, On Thu, Jun 2, 2011 at 5:07 PM, Darren Dale wrote: > On Thu, Jun 2, 2011 at 7:46 PM, Eric Firing wrote: ... >> Even without the foulup, I think you would see that the merges from >> maintenance branches into subsequent branches and into master make it >> very hard to figure out what has actu

Re: [matplotlib-devel] v1.0.x branch seems confused

On Thu, Jun 2, 2011 at 7:46 PM, Eric Firing wrote: > On 06/02/2011 12:35 PM, Darren Dale wrote: >> On Thu, Jun 2, 2011 at 6:07 PM, Eric Firing  wrote: >>> Going forward, is there any good reason to retain all the old branches >>> (transforms, 0.91.x etc.)? >> >> I don't think we need the transform

Re: [matplotlib-devel] v1.0.x branch seems confused

On 06/02/2011 12:35 PM, Darren Dale wrote: > On Thu, Jun 2, 2011 at 6:07 PM, Eric Firing wrote: >> On 06/02/2011 11:48 AM, Darren Dale wrote: >> [...] >>> >>> I had another look at the history after rereading Pauli's email. I'm >>> going to try the following on a temporary v1.0.x-cleanup branch: >

Re: [matplotlib-devel] v1.0.x branch seems confused

On Thu, Jun 2, 2011 at 6:35 PM, Darren Dale wrote: > On Thu, Jun 2, 2011 at 6:07 PM, Eric Firing wrote: >> On 06/02/2011 11:48 AM, Darren Dale wrote: >> [...] >>> >>> I had another look at the history after rereading Pauli's email. I'm >>> going to try the following on a temporary v1.0.x-cleanup

Re: [matplotlib-devel] v1.0.x branch seems confused

On Thu, Jun 2, 2011 at 6:07 PM, Eric Firing wrote: > On 06/02/2011 11:48 AM, Darren Dale wrote: > [...] >> >> I had another look at the history after rereading Pauli's email. I'm >> going to try the following on a temporary v1.0.x-cleanup branch: >> >> * "git reset --hard 0e6dad5230" >> * redo pul

Re: [matplotlib-devel] v1.0.x branch seems confused

On 06/02/2011 11:48 AM, Darren Dale wrote: [...] > > I had another look at the history after rereading Pauli's email. I'm > going to try the following on a temporary v1.0.x-cleanup branch: > > * "git reset --hard 0e6dad5230" > * redo pull request 103 > * cherry-pick the following commits off of the

Re: [matplotlib-devel] v1.0.x branch seems confused

On Thu, Jun 2, 2011 at 5:00 PM, Darren Dale wrote: > On Thu, Jun 2, 2011 at 4:46 PM, Benjamin Root wrote: >> >> >> On Wed, Jun 1, 2011 at 6:20 PM, Matthew Brett >> wrote: >>> >>> Hi, >>> >>> On Wed, Jun 1, 2011 at 4:06 PM, Eric Firing wrote: >>> > On 06/01/2011 12:38 PM, Matthew Brett wrote: >>

Re: [matplotlib-devel] v1.0.x branch seems confused

On Thu, Jun 2, 2011 at 4:46 PM, Benjamin Root wrote: > > > On Wed, Jun 1, 2011 at 6:20 PM, Matthew Brett > wrote: >> >> Hi, >> >> On Wed, Jun 1, 2011 at 4:06 PM, Eric Firing wrote: >> > On 06/01/2011 12:38 PM, Matthew Brett wrote: >> >> Hi, >> >> >> >> On Wed, Jun 1, 2011 at 12:58 PM, Eric Firin

Re: [matplotlib-devel] v1.0.x branch seems confused

Mike, On Wed, Jun 1, 2011 at 2:26 PM, Michael Droettboom wrote: > Yes, it seems that the v1.0.x got hosed somehow back in early May.  Eric > Firing did some spelunking and traced it to a push I made, but I'm not sure > what I did wrong, and I'm even less sure how to fix it.  If someone with > mor

Re: [matplotlib-devel] v1.0.x branch seems confused

On Wed, Jun 1, 2011 at 6:20 PM, Matthew Brett wrote: > Hi, > > On Wed, Jun 1, 2011 at 4:06 PM, Eric Firing wrote: > > On 06/01/2011 12:38 PM, Matthew Brett wrote: > >> Hi, > >> > >> On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing > wrote: > The current practice worked very nicely with SVN (IMH

Re: [matplotlib-devel] v1.0.x branch seems confused

Hi, On Wed, Jun 1, 2011 at 4:06 PM, Eric Firing wrote: > On 06/01/2011 12:38 PM, Matthew Brett wrote: >> Hi, >> >> On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing  wrote: The current practice worked very nicely with SVN (IMHO), and I think it >>> >>> (I recall that Mike had to rescue us more th

Re: [matplotlib-devel] v1.0.x branch seems confused

Hi, On Wed, Jun 1, 2011 at 4:05 PM, Darren Dale wrote: > On Wed, Jun 1, 2011 at 6:38 PM, Matthew Brett wrote: >> Hi, >> >> On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing wrote: The current practice worked very nicely with SVN (IMHO), and I think it >>> >>> (I recall that Mike had to rescue u

Re: [matplotlib-devel] v1.0.x branch seems confused

On 06/01/2011 12:38 PM, Matthew Brett wrote: > Hi, > > On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing wrote: >>> The current practice worked very nicely with SVN (IMHO), and I think it >> >> (I recall that Mike had to rescue us more than once from svnmerge >> confusions, at least during the earlier

Re: [matplotlib-devel] v1.0.x branch seems confused

On Wed, Jun 1, 2011 at 6:38 PM, Matthew Brett wrote: > Hi, > > On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing wrote: >>> The current practice worked very nicely with SVN (IMHO), and I think it >> >> (I recall that Mike had to rescue us more than once from svnmerge >> confusions, at least during the

Re: [matplotlib-devel] v1.0.x branch seems confused

Hi, On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing wrote: >> The current practice worked very nicely with SVN (IMHO), and I think it > > (I recall that Mike had to rescue us more than once from svnmerge > confusions, at least during the earlier days.) I was just idly looking at the matplotlib netw

Re: [matplotlib-devel] v1.0.x branch seems confused

On Wed, Jun 1, 2011 at 2:58 PM, Eric Firing wrote: > On 06/01/2011 09:07 AM, Benjamin Root wrote: > > > > > > On Wed, Jun 1, 2011 at 1:47 PM, Eric Firing > > wrote: > > > > On 06/01/2011 08:26 AM, Michael Droettboom wrote: > > > Yes, it seems that the v1.0.x g

Re: [matplotlib-devel] v1.0.x branch seems confused

On 06/01/2011 09:07 AM, Benjamin Root wrote: > > > On Wed, Jun 1, 2011 at 1:47 PM, Eric Firing > wrote: > > On 06/01/2011 08:26 AM, Michael Droettboom wrote: > > Yes, it seems that the v1.0.x got hosed somehow back in early > May. Eric > > Firing did so

Re: [matplotlib-devel] v1.0.x branch seems confused

On Wed, Jun 1, 2011 at 1:47 PM, Eric Firing wrote: > On 06/01/2011 08:26 AM, Michael Droettboom wrote: > > Yes, it seems that the v1.0.x got hosed somehow back in early May. Eric > > Firing did some spelunking and traced it to a push I made, but I'm not > > sure what I did wrong, and I'm even les

Re: [matplotlib-devel] v1.0.x branch seems confused

On 06/01/2011 08:26 AM, Michael Droettboom wrote: > Yes, it seems that the v1.0.x got hosed somehow back in early May. Eric > Firing did some spelunking and traced it to a push I made, but I'm not > sure what I did wrong, and I'm even less sure how to fix it. If someone > with more git-fu wants to

Re: [matplotlib-devel] v1.0.x branch seems confused

Yes, it seems that the v1.0.x got hosed somehow back in early May. Eric Firing did some spelunking and traced it to a push I made, but I'm not sure what I did wrong, and I'm even less sure how to fix it. If someone with more git-fu wants to investigate and repair it, that would be fantastic,

[matplotlib-devel] v1.0.x branch seems confused

I am testing the doc builds on v1.0.x when I noticed that it seems to think that it is version 1.1.0. Sure enough, somehow lib/matplotlib/__init__.py has __version__ defined as '1.1.0'. Meanwhile, I can't seem to finish a doc build on the v1.0.x branch, but I could with my docfix/smalltypos branc