Re: [matplotlib-devel] v1.1.x branch was (temporarily) wrong

[Michael Droettboom]

On 12/06/2011 10:10 PM, Benjamin Root wrote:



On Tuesday, December 6, 2011, Michael Droettboom > wrote:

> Yesterday I managed to accidentally move the v1.1.x branch pointer to
> point to master.  I have since moved it back, but you may need to rebase
> if you have any active branches based on the (wrong) v1.1.x branch.  The
> following should suffice:
>
>git fetch upstream
>git rebase upstream/v1.1.x
>
> Mike
>

I am getting a whole bunch of conflict errors.  I wonder if it is 
because I rebased already when v1.1.x was pointed to master?  Are we 
sure that v1.1.x is ok?  If so, I could just delete my copy and 
refetch it from upstream?
It's quite possible to get conflict errors if you rebased on v1.1.x when 
it was the same as master and are now going back.  I'm really sorry for 
the inconvenience this mistake caused.


But it should be possible to reapply your new commits on top of v1.1.x 
without too much trouble.  Feel free to contact me off list and maybe we 
can get to the bottom of what's going on for you.


Cheers,
Mike
--
Cloud Services Checklist: Pricing and Packaging Optimization
This white paper is intended to serve as a reference, checklist and point of 
discussion for anyone considering optimizing the pricing and packaging model 
of a cloud services business. Read Now!
http://www.accelacomm.com/jaw/sfnl/114/51491232/___
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel

Re: [matplotlib-devel] v1.1.x branch was (temporarily) wrong

[Benjamin Root]

On Wed, Dec 7, 2011 at 8:56 AM, Michael Droettboom  wrote:

>  On 12/06/2011 10:10 PM, Benjamin Root wrote:
>
>
>
> On Tuesday, December 6, 2011, Michael Droettboom  wrote:
> > Yesterday I managed to accidentally move the v1.1.x branch pointer to
> > point to master.  I have since moved it back, but you may need to rebase
> > if you have any active branches based on the (wrong) v1.1.x branch.  The
> > following should suffice:
> >
> >git fetch upstream
> >git rebase upstream/v1.1.x
> >
> > Mike
> >
>
> I am getting a whole bunch of conflict errors.  I wonder if it is because
> I rebased already when v1.1.x was pointed to master?  Are we sure that
> v1.1.x is ok?  If so, I could just delete my copy and refetch it from
> upstream?
>
> It's quite possible to get conflict errors if you rebased on v1.1.x when
> it was the same as master and are now going back.  I'm really sorry for the
> inconvenience this mistake caused.
>
> But it should be possible to reapply your new commits on top of v1.1.x
> without too much trouble.  Feel free to contact me off list and maybe we
> can get to the bottom of what's going on for you.
>
> Cheers,
> Mike
>

As a note, it appears that doing "git rebase upstream/v1.1.x -s ours"
produces the correct result.  Although, I think it might have set my push
remote to point to the matplotlib repo and not my own github repo, but I
might be wrong on that.

Ben Root
--
Cloud Services Checklist: Pricing and Packaging Optimization
This white paper is intended to serve as a reference, checklist and point of 
discussion for anyone considering optimizing the pricing and packaging model 
of a cloud services business. Read Now!
http://www.accelacomm.com/jaw/sfnl/114/51491232/___
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel

Re: [matplotlib-devel] jsxgraph or flot backend (or interactive viewer for svg backend?)

[Chris Barker]

On 12/5/11 9:49 PM, Jason Grout wrote:
> Has anyone ever worked on a backend that generates javascript code for
> one of the javascript plotters out there (like jsxgraph or flot)?
> Alternatively, I suppose we could generate an svg or html5 plot and then
> accompany it with the javascript code to trace the function, etc.

Someone has worked on a html5 back-end, It was jsut discussed a bit on 
the thread "Using the Agg renderer by itself"

Here's a cut and paste:

On 11/27/11 12:33 PM, Ludwig Schwardt wrote:
 >
 > Ben is referring to mplh5canvas, available at
 > http://code.google.com/p/mplh5canvas/. The main advantage of this
 > approach is interactive zooming of plots within the browser. If this is
 > not important to you, it will probably be faster to generate static PNGs
 > or SVGs.
 >
 > The HTML5 backend should be easy to try out, as it is a pure Python
 > package with no onerous dependencies.
 >

-Chris







-- 
Christopher Barker, Ph.D.
Oceanographer

Emergency Response Division
NOAA/NOS/OR&R(206) 526-6959   voice
7600 Sand Point Way NE   (206) 526-6329   fax
Seattle, WA  98115   (206) 526-6317   main reception

chris.bar...@noaa.gov

--
Cloud Services Checklist: Pricing and Packaging Optimization
This white paper is intended to serve as a reference, checklist and point of 
discussion for anyone considering optimizing the pricing and packaging model 
of a cloud services business. Read Now!
http://www.accelacomm.com/jaw/sfnl/114/51491232/
___
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel

Re: [matplotlib-devel] jsxgraph or flot backend (or interactive viewer for svg backend?)

[Jason Grout]

On 12/7/11 10:27 PM, Chris Barker wrote:
> On 12/5/11 9:49 PM, Jason Grout wrote:
>> Has anyone ever worked on a backend that generates javascript code for
>> one of the javascript plotters out there (like jsxgraph or flot)?
>> Alternatively, I suppose we could generate an svg or html5 plot and then
>> accompany it with the javascript code to trace the function, etc.
>
> Someone has worked on a html5 back-end, It was jsut discussed a bit on
> the thread "Using the Agg renderer by itself"
>
> Here's a cut and paste:
>
> On 11/27/11 12:33 PM, Ludwig Schwardt wrote:
>   >
>   >  Ben is referring to mplh5canvas, available at
>   >  http://code.google.com/p/mplh5canvas/. The main advantage of this
>   >  approach is interactive zooming of plots within the browser. If this is
>   >  not important to you, it will probably be faster to generate static PNGs
>   >  or SVGs.
>   >
>   >  The HTML5 backend should be easy to try out, as it is a pure Python
>   >  package with no onerous dependencies.
>   >

Michael Droettboom played with this a little at the Sage Days in March, 
IIRC, and I seem to think he also whipped up an interactive demo using 
svg plots.  Michael, do you remember what your conclusions were?

Thanks,

Jason



--
Cloud Services Checklist: Pricing and Packaging Optimization
This white paper is intended to serve as a reference, checklist and point of 
discussion for anyone considering optimizing the pricing and packaging model 
of a cloud services business. Read Now!
http://www.accelacomm.com/jaw/sfnl/114/51491232/
___
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel