Re: [matplotlib-devel] new release?

2008-05-29 Thread Darren Dale
On Wednesday 28 May 2008 10:42:57 pm John Hunter wrote: > On Wed, May 28, 2008 at 8:30 PM, Charlie Moad <[EMAIL PROTECTED]> wrote: > > Should we still proceed with this now that numpy 1.1.0 is out? Any > > holdups? [...] > So let's focus on clearing these bugs (and anything else the other > devs r

Re: [matplotlib-devel] new release?

2008-05-29 Thread Darren Dale
On Thursday 29 May 2008 06:39:26 am Darren Dale wrote: > On Wednesday 28 May 2008 10:42:57 pm John Hunter wrote: > > On Wed, May 28, 2008 at 8:30 PM, Charlie Moad <[EMAIL PROTECTED]> wrote: > > > Should we still proceed with this now that numpy 1.1.0 is out? Any > > > holdups? > > [...] > > > So l

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Darren Dale
I am trying to merge a change to texmanager from the branch to the trunk, but something doesnt look right after I ran svnmerge.py. Look at all the markup in the diff, I can't commit this, can I? $ svn diff Property changes on: . __

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread John Hunter
On Thu, May 29, 2008 at 9:01 AM, Darren Dale <[EMAIL PROTECTED]> wrote: > I am trying to merge a change to texmanager from the branch to the trunk, but > something doesnt look right after I ran svnmerge.py. Look at all the markup > in the diff, I can't commit this, can I? No. The > +<<< .work

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Darren Dale
On Thursday 29 May 2008 10:04:34 am you wrote: > On Thu, May 29, 2008 at 9:01 AM, Darren Dale <[EMAIL PROTECTED]> wrote: > > I am trying to merge a change to texmanager from the branch to the trunk, > > but something doesnt look right after I ran svnmerge.py. Look at all the > > markup in the diff

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Darren Dale
On Thursday 29 May 2008 10:15:07 am John Hunter wrote: > On Thu, May 29, 2008 at 9:11 AM, Darren Dale <[EMAIL PROTECTED]> wrote: > > I dont understand. I thought the point of svnmerge.py was to sync the > > change, not to introduce conflicts. Is the procedure you just outlined > > the standard ope

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread John Hunter
On Thu, May 29, 2008 at 9:41 AM, Darren Dale <[EMAIL PROTECTED]> wrote: > Thats not what I want, I only want to commit the changes I made to CHANGELOG > and texmanager. I tried reverting the changes with svn revert, but now when I > do a diff, I get: > > $ svn diff > > Property changes on: . > ___

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Michael Droettboom
Darren Dale wrote: > On Thursday 29 May 2008 10:04:34 am you wrote: > >> On Thu, May 29, 2008 at 9:01 AM, Darren Dale <[EMAIL PROTECTED]> >> > wrote: > >>> I am trying to merge a change to texmanager from the branch to the trunk, >>> but something doesnt look right after I ran svnmerge.

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Michael Droettboom
Darren Dale wrote: > On Thursday 29 May 2008 10:15:07 am John Hunter wrote: > >> On Thu, May 29, 2008 at 9:11 AM, Darren Dale <[EMAIL PROTECTED]> >> > wrote: > >>> I dont understand. I thought the point of svnmerge.py was to sync the >>> change, not to introduce conflicts. Is the proced

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread John Hunter
On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <[EMAIL PROTECTED]> wrote: > So, this is more the fault of operating procedure (choosing not to do the > numpy renaming on the branch, for instance, which in itself was not a bad > decision in isolation), than the tool itself. Note that svnmerge

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Darren Dale
Thanks Mike. On Thursday 29 May 2008 10:59:40 am Michael Droettboom wrote: > Darren Dale wrote: > > On Thursday 29 May 2008 10:15:07 am John Hunter wrote: > >> On Thu, May 29, 2008 at 9:11 AM, Darren Dale <[EMAIL PROTECTED]> > > > > wrote: > >>> I dont understand. I thought the point of svnmerge.p

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Michael Droettboom
John Hunter wrote: > On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <[EMAIL PROTECTED]> wrote: > > >> So, this is more the fault of operating procedure (choosing not to do the >> numpy renaming on the branch, for instance, which in itself was not a bad >> decision in isolation), than the to

Re: [matplotlib-devel] new release?

2008-05-29 Thread Darren Dale
On Thursday 29 May 2008 08:28:20 am Darren Dale wrote: > On Thursday 29 May 2008 06:39:26 am Darren Dale wrote: > > On Wednesday 28 May 2008 10:42:57 pm John Hunter wrote: > > > On Wed, May 28, 2008 at 8:30 PM, Charlie Moad <[EMAIL PROTECTED]> wrote: > > > > Should we still proceed with this now th

Re: [matplotlib-devel] new release?

2008-05-29 Thread Darren Dale
On Thursday 29 May 2008 11:32:10 am Darren Dale wrote: > On Thursday 29 May 2008 08:28:20 am Darren Dale wrote: > > On Thursday 29 May 2008 06:39:26 am Darren Dale wrote: > > > On Wednesday 28 May 2008 10:42:57 pm John Hunter wrote: > > > > On Wed, May 28, 2008 at 8:30 PM, Charlie Moad <[EMAIL PROT

Re: [matplotlib-devel] new release?

2008-05-29 Thread John Hunter
On Thu, May 29, 2008 at 10:46 AM, Darren Dale <[EMAIL PROTECTED]> r > Looks like something else just turned up in ticker.py on the trunk. Somebody > replaced minus signs with unicode, a good idea, but it breaks latex if > unicode support is not enabled for usetex. I don't have time to fix it. I j

Re: [matplotlib-devel] new release?

2008-05-29 Thread Michael Droettboom
I'm happy to deal with this, but I wonder about the best path. Is it reasonable to assume that we have unicode support available in LaTeX and can just turn it on always, or do we need to (for instance) convert all the Unicode minus signs back into "-" and put the whole thing inside "$ $" (some

Re: [matplotlib-devel] new release?

2008-05-29 Thread Michael Droettboom
Disregard this -- I think John's solution looks good. Cheers, Mike Michael Droettboom wrote: > I'm happy to deal with this, but I wonder about the best path. > > Is it reasonable to assume that we have unicode support available in > LaTeX and can just turn it on always, or do we need to (for in

Re: [matplotlib-devel] new release?

2008-05-29 Thread Darren Dale
I agree, this looks good. I'd really like to get a 98pre out soon, so I can distribute my own project which requires it. On Thursday 29 May 2008 12:04:29 pm Michael Droettboom wrote: > Disregard this -- I think John's solution looks good. > > Cheers, > Mike > > Michael Droettboom wrote: > > I'm

Re: [matplotlib-devel] new release?

2008-05-29 Thread John Hunter
On Wed, May 28, 2008 at 8:30 PM, Charlie Moad <[EMAIL PROTECTED]> wrote: > Should we still proceed with this now that numpy 1.1.0 is out? Any holdups? We are now ready to do 0.98pre -- fire when ready Charlie. JDH - This SF

Re: [matplotlib-devel] new release?

2008-05-29 Thread John Hunter
On Thu, May 29, 2008 at 12:09 PM, John Hunter <[EMAIL PROTECTED]> wrote: > On Wed, May 28, 2008 at 8:30 PM, Charlie Moad <[EMAIL PROTECTED]> wrote: >> Should we still proceed with this now that numpy 1.1.0 is out? Any holdups? > > We are now ready to do 0.98pre -- fire when ready Charlie. 91.3 is

Re: [matplotlib-devel] new release?

2008-05-29 Thread Eric Firing
John Hunter wrote: > On Thu, May 29, 2008 at 12:09 PM, John Hunter <[EMAIL PROTECTED]> wrote: >> On Wed, May 28, 2008 at 8:30 PM, Charlie Moad <[EMAIL PROTECTED]> wrote: >>> Should we still proceed with this now that numpy 1.1.0 is out? Any holdups? >> We are now ready to do 0.98pre -- fire when r

Re: [matplotlib-devel] new release?

2008-05-29 Thread John Hunter
On Thu, May 29, 2008 at 1:52 PM, Eric Firing <[EMAIL PROTECTED]> wrote: > To what bug do you refer? There seem to be related zoom-to-rect bugs in > both the trunk and the branch. In both, zooming in to a region comparable > to, or smaller than, a "pixel" (meaning a grid cell in the data array),

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread John Hunter
On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <[EMAIL PROTECTED]> wrote: > Minor point: On my machine at least, I don't have to manually clean up the > conflict files -- they are removed for me on the next commit. Those files > are really just for reference. If you use a SVN frontend for d

[matplotlib-devel] mplscape

2008-05-29 Thread John Hunter
For those of you who haven't had the pleasure of seeing Michael's spline paths in action, I added a new interactive demo on the trunk: examples/event_handling/path_editor.py Click and drag the vertices to edit the spline path. It needs some more work - eg I want to be able to add and delete ve

Re: [matplotlib-devel] new release?

2008-05-29 Thread Charlie Moad
Just to confirm, I should use the version tag, "0.98pre"? - Charlie On Thu, May 29, 2008 at 1:09 PM, John Hunter <[EMAIL PROTECTED]> wrote: > On Wed, May 28, 2008 at 8:30 PM, Charlie Moad <[EMAIL PROTECTED]> wrote: >> Should we still proceed with this now that numpy 1.1.0 is out? Any holdups? >

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Michael Droettboom
John Hunter wrote: > On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <[EMAIL PROTECTED]> wrote: > > >> Minor point: On my machine at least, I don't have to manually clean up the >> conflict files -- they are removed for me on the next commit. Those files >> are really just for reference. I

Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

2008-05-29 Thread Michael Droettboom
Michael Droettboom wrote: > John Hunter wrote: > >> On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <[EMAIL PROTECTED]> >> wrote: >> >> >> >>> Minor point: On my machine at least, I don't have to manually clean up the >>> conflict files -- they are removed for me on the next commit.

Re: [matplotlib-devel] new release?

2008-05-29 Thread John Hunter
On Thu, May 29, 2008 at 5:44 PM, Charlie Moad <[EMAIL PROTECTED]> wrote: > Just to confirm, I should use the version tag, "0.98pre"? My preference is to call it 0.98.0 unless Michael is feeling extra cautious. In which case we can call it 0.98pre or 0.98rc1 or whatever ... JDH -

Re: [matplotlib-devel] new release?

2008-05-29 Thread Charlie Moad
I went ahead and called it 0.98.0. I am getting a parallels image updated so I can do the windows builds, but it is getting late. I will get those cranked out tomorrow. The source and mac builds are up though. I got two internal compiler errors on the 0.98.0 build, which I fixed by replacing -O