matplotlib-devel Mailing List for matplotlib

On 03/31/2011 05:33 AM, Michael Droettboom wrote:
> We have a few orphaned RST pages in the documentation tree -- these are
> files that are in our source tree, but are not linked to by any table of
> contents within the documentation.
>
> It's possible that some of these were started but not completed, or
> obsoleted but not fully removed.  I've looked up the last few authors of
> each file -- can you help me triage them?
>
> faq/environment_variables.rst (John, Darren)
> mpl_toolkits/axes_grid/index.rst (Jae-Joon, Paul)
> mpl_toolkits/mplot3d/index.rst (Reinier)
> users/arraydata.rst (Eric)

Yes, this is something I started and obviously did not finish. If 
finished, it would be a useful addition to the User's guide.  And now 
while looking at that, I see some errors in the Image Tutorial...

> users/plotting.rst (John)

This was a draft framework for filling out the User's guide.  A push was 
started a couple summers ago, progress was made, but major chunks (some 
of which I signed up for) are still missing.

Eric

>
> Mike
>

Michael Droettboom, on 2011-03-31 12:04,  wrote:
> On 03/31/2011 11:46 AM, Benjamin Root wrote:
> > Maybe we need an entry for mpl_toolkit items?
> Yes.  I think we should add a toolkit category to the table of
> contents and add this and AxesGrid there.

+1 

I guess I always find the docs for those using the search, but
it'd be better to have them at least somewhat integrated with the
rest of the docs. Plus it will bring the zeroth Betti number down
for the docs, and I'd consider it a bug if that number is
anything other than 1. 


(Can you tell I've been reading a pop-math book lately?
_Poincaré's prize_ is actually quite accessbile)
-- 
Paul Ivanov
314 address only used for lists,  off-list direct email at:
http://pirsquared.org | GPG/PGP key id: 0x0F3E28F7 

On Sat, Mar 26, 2011 at 10:16 AM, Virgil Stokes <vs...@it...> wrote:

> I found that
>
> def set_sort_zpos(self,val):
>      '''Set the position to use for z-sorting.'''
>      self._sort_zpos = val
>
> was missing from
>
> class Line3DCollection(LineCollection) (in matplotlib 1.0.1):
>
> Now,  with the above method added, add_collection3d works as it should with
> line
> segments, and the following will work as expected :-)
>
> '''
>  Purpose: Waterfall plot using LineCollection
>  Author: V.P.S. (2011-03-26)
> '''
> from mpl_toolkits.mplot3d import Axes3D
> from matplotlib.collections import LineCollection
> from matplotlib.colors import colorConverter
> import matplotlib.pyplot as plt
> import numpy as np
>
> np.random.seed(40040157) # Used to allow repeatable experiments (plots)
>
> fig = plt.figure()
> ax = fig.gca(projection='3d')
>
> cc = [colorConverter.to_rgba(c,alpha=0.6) for c in
> ('r','g','b','c','y','m','k')]
> ncc = len(cc)
>
> nxs = 5      # Num of points to connect (nxs-1 line segments)
> # Generate X values
> xs = np.arange(1, nxs+1, 1)
>
> # Create array of Y values (to be updated)
> ys = np.zeros(nxs)
>
> # Create list of Z values
> nzs = 4      # Num of Z-planes
> zs = [zs+1 for zs in range(nzs)]
>
> # Create list of colors (cyclic) for lines
> colorlist = [cc[j%ncc] for j in range(nzs)]
>
> segs = []
> # Generate line segments in each Z-plane
> for j in zs:
>     ys = np.random.rand(nxs)
>     segs.append(zip(xs, ys))
>
> curves = LineCollection(segs, colors = colorlist)
>
> ax.add_collection3d(curves, zs=zs, zdir='y')
>
> ax.set_xlabel('X')         # points to right     -- X
> ax.set_xlim3d(0, nxs+1)
> ax.set_ylabel('Y')         # points into screen  -- Y
> ax.set_ylim3d(0, nzs+1)
> ax.set_zlabel('Z')         # points up           -- Z
> ax.set_zlim3d(0, 1)
>
> plt.show()
>
> Have a Good Day
> --V
>
>
Virgil,

Thanks for noticing this.  There are several missing methods in the various
3D collections and artists, and I am sure we haven't found them all yet.  I
am currently too busy to investigate why this particular one was missing,
but in about a month I will have some time to do so.

Ben Root

On 03/31/2011 11:46 AM, Benjamin Root wrote:
> On Thu, Mar 31, 2011 at 10:33 AM, Michael Droettboom <md...@st... 
> <mailto:md...@st...>> wrote:
>
>     We have a few orphaned RST pages in the documentation tree --
>     these are
>     files that are in our source tree, but are not linked to by any
>     table of
>     contents within the documentation.
>
>     It's possible that some of these were started but not completed, or
>     obsoleted but not fully removed.  I've looked up the last few
>     authors of
>     each file -- can you help me triage them?
>
>     faq/environment_variables.rst (John, Darren)
>     mpl_toolkits/axes_grid/index.rst (Jae-Joon, Paul)
>     mpl_toolkits/mplot3d/index.rst (Reinier)
>     users/arraydata.rst (Eric)
>     users/plotting.rst (John)
>
>     Mike
>
>     --
>     Michael Droettboom
>     Science Software Branch
>     Space Telescope Science Institute
>     Baltimore, Maryland, USA
>
>
> For mpl_toolkits/mplot3d/index.rst, I cleaned it up and improved it 
> slightly, but I have no clue where in the broader documentation it 
> belongs.  Maybe we need an entry for mpl_toolkit items?
Yes.  I think we should add a toolkit category to the table of contents 
and add this and AxesGrid there.

Mike

-- 
Michael Droettboom
Science Software Branch
Space Telescope Science Institute
Baltimore, Maryland, USA

On Thu, Mar 31, 2011 at 10:33 AM, Michael Droettboom <md...@st...>wrote:

> We have a few orphaned RST pages in the documentation tree -- these are
> files that are in our source tree, but are not linked to by any table of
> contents within the documentation.
>
> It's possible that some of these were started but not completed, or
> obsoleted but not fully removed.  I've looked up the last few authors of
> each file -- can you help me triage them?
>
> faq/environment_variables.rst (John, Darren)
> mpl_toolkits/axes_grid/index.rst (Jae-Joon, Paul)
> mpl_toolkits/mplot3d/index.rst (Reinier)
> users/arraydata.rst (Eric)
> users/plotting.rst (John)
>
> Mike
>
> --
> Michael Droettboom
> Science Software Branch
> Space Telescope Science Institute
> Baltimore, Maryland, USA
>
>
For mpl_toolkits/mplot3d/index.rst, I cleaned it up and improved it
slightly, but I have no clue where in the broader documentation it belongs.
Maybe we need an entry for mpl_toolkit items?

Ben Root

We have a few orphaned RST pages in the documentation tree -- these are 
files that are in our source tree, but are not linked to by any table of 
contents within the documentation.

It's possible that some of these were started but not completed, or 
obsoleted but not fully removed.  I've looked up the last few authors of 
each file -- can you help me triage them?

faq/environment_variables.rst (John, Darren)
mpl_toolkits/axes_grid/index.rst (Jae-Joon, Paul)
mpl_toolkits/mplot3d/index.rst (Reinier)
users/arraydata.rst (Eric)
users/plotting.rst (John)

Mike

-- 
Michael Droettboom
Science Software Branch
Space Telescope Science Institute
Baltimore, Maryland, USA

Doh!

That was exactly it.  I followed every single step, but that one must have
been invisible when I read it.  Yes, that’s it, it was invisible!

:)

Thanks for the quick response,
--James

> -----Original Message-----
> From: Matthew Brett [mailto:mat...@gm...]
> Sent: Wednesday, March 30, 2011 12:10 PM
> To: James Evans
> Cc: mat...@li...
> Subject: Re: [matplotlib-devel] git repository access
> 
> Hi,
> 
> On Wed, Mar 30, 2011 at 12:06 PM, James Evans <jre...@ea...>
> wrote:
> > Hello All,
> >
> >
> >
> > I am finally getting around to checking out a local copy of the git
> > repository following the directions here:
> >
> > http://matplotlib.github.com/devel/gitwash/set_up_fork.html
> >
> >
> >
> > and I keep getting the following error:
> >
> >
> >
> > ~/source % git clone gi...@gi...:jrevans/matplotlib.git
> > matplotlib-git
> >
> > Cloning into matplotlib-git...
> >
> > Permission denied (publickey).
> >
> > fatal: The remote end hung up unexpectedly
> >
> >
> >
> > I also tried replacing ‘git@’ with my github username ‘jrevans@’
> >
> >
> >
> > Is this a github permission error?  This is my first time using git,
> > so I am still learning.
> 
> Did you follow the instructions at
> http://matplotlib.github.com/devel/gitwash/forking_hell.html#set-up-and-
> configure-a-github-account
> ?  Particularly the ssh key stuff?
> 
> http://help.github.com/linux-set-up-git/
> 
> Best,
> 
> Matthew
> 
>
----------------------------------------------------------------------------
--
> Create and publish websites with WebMatrix Use the most popular FREE
> web apps or write code yourself; WebMatrix provides all the features you
> need to develop and publish your website. http://p.sf.net/sfu/ms-
> webmatrix-sf
> _______________________________________________
> Matplotlib-devel mailing list
> Mat...@li...
> https://lists.sourceforge.net/lists/listinfo/matplotlib-devel

On Wed, Mar 30, 2011 at 3:06 PM, James Evans <jre...@ea...> wrote:
> Hello All,
>
>
>
> I am finally getting around to checking out a local copy of the git
> repository following the directions here:
>
> http://matplotlib.github.com/devel/gitwash/set_up_fork.html
>
>
>
> and I keep getting the following error:
>
>
>
> ~/source % git clone gi...@gi...:jrevans/matplotlib.git matplotlib-git
>
> Cloning into matplotlib-git...
>
> Permission denied (publickey).
>
> fatal: The remote end hung up unexpectedly
>
>
>
> I also tried replacing ‘git@’ with my github username ‘jrevans@’
>
>
>
> Is this a github permission error?  This is my first time using git, so I am
> still learning.
>
>
>
> Any help would be appreciated.

You probably haven't registered your encryption key, which I think is
needed for the git@ protocol. See
http://help.github.com/troubleshooting-ssh/

Hi,

On Wed, Mar 30, 2011 at 12:06 PM, James Evans <jre...@ea...> wrote:
> Hello All,
>
>
>
> I am finally getting around to checking out a local copy of the git
> repository following the directions here:
>
> http://matplotlib.github.com/devel/gitwash/set_up_fork.html
>
>
>
> and I keep getting the following error:
>
>
>
> ~/source % git clone gi...@gi...:jrevans/matplotlib.git matplotlib-git
>
> Cloning into matplotlib-git...
>
> Permission denied (publickey).
>
> fatal: The remote end hung up unexpectedly
>
>
>
> I also tried replacing ‘git@’ with my github username ‘jrevans@’
>
>
>
> Is this a github permission error?  This is my first time using git, so I am
> still learning.

Did you follow the instructions at
http://matplotlib.github.com/devel/gitwash/forking_hell.html#set-up-and-configure-a-github-account
?  Particularly the ssh key stuff?

http://help.github.com/linux-set-up-git/

Best,

Matthew

Hello All,

 

I am finally getting around to checking out a local copy of the git
repository following the directions here:

http://matplotlib.github.com/devel/gitwash/set_up_fork.html

 

and I keep getting the following error:

 

~/source % git clone gi...@gi...:jrevans/matplotlib.git matplotlib-git

Cloning into matplotlib-git...

Permission denied (publickey).

fatal: The remote end hung up unexpectedly

 

I also tried replacing 'git@' with my github username 'jrevans@'

 

Is this a github permission error?  This is my first time using git, so I am
still learning.

 

Any help would be appreciated.

 

Thanks,

--James Evans

On Tue, Mar 29, 2011 at 12:52 PM, Michael Droettboom <md...@st...> wrote:
> I would love a Mac user to build and run regression tests on both Python
> 2.x and Python 3.x, and run some interactive examples, particularly the
> mac os backend, as I haven't been able to test that personally.

I'm not able to get the cocoaagg backend working with v1.0.1 and
python-2.7. When I set the backend to cocoaagg in matplotlibrc, start
"ipython -pylab", and do "plot([1,2])", I get a figure window with no
axes, and an error message:

2011-03-30 11:48:30.149 Python[18435:903] Inconsistent set of values
to create NSBitmapImageRep

I get the same results if I install from the latest sources or if I
install using macports. This is with OS X 10.6.6 and pyobjc-2.2. I am
unable to install and test with pyobjc-2.3 from pypi, several of the
subpackages fail to install, including pyobjc-framework-Cocoa.

Darren

Hi Mike,

On Tue, Mar 29, 2011 at 12:52 PM, Michael Droettboom <md...@st...> wrote:
> Things are looking pretty good over on the Python 3 branch, thanks to
> the great work done at CTPUG, Sage Days 29 and elsewhere, and it
> probably bears some discussion about where we'd like to go from here.
>
> I'm thinking we should probably do another 1.0.x release with all of the
> bugfixes we currently have on that branch.
>
> Then, the question is when to start treating the py3 branch as master.
> The only downside on Python 2.x (that I'm aware of) is the dropped
> support for Python < 2.6.  There are still a number of reasons (mainly
> due to external library dependencies) that one may not to run matplotlib
> on Python 3.x, but that's a separate question, IMHO.
>
> The status of the Py3 work is here:
>
> https://github.com/matplotlib/matplotlib-py3/wiki
>
> I would love a Mac user to build and run regression tests on both Python
> 2.x and Python 3.x, and run some interactive examples, particularly the
> mac os backend, as I haven't been able to test that personally.
>
> Thoughts?

How about the following:

1) Cut a new v1.0.x release, update the documentation at the
sourceforge site, and announce on all the mailing lists that
development has moved to github.

2) Announce that the v1.1.x series will be the last to support
<=python-2.5, and that a v1.1.x feature freeze is about to go into
effect. Once devs have the features committed that they will need with
<=python-2.5, create the v1.1.x maintenance branch and cut the 1.1.0
release.

3) Merge matplotlib-py3/master into matplotlib/master, champagne and doughnuts

4?) Make v1.2.0alpha1 binaries available so bleeding edgers can help
identify issues on Windows (and maybe OS X).

Darren

Hello,

Dateutil 2.0 is now available for Python 3.x at 
<http://niemeyer.net/python-dateutil>.

The example user_interfaces/mathtext_wx.py is broken since as_rgba_str() 
was removed from the ft2font extension. A patch is attached.

Christoph

Things are looking pretty good over on the Python 3 branch, thanks to 
the great work done at CTPUG, Sage Days 29 and elsewhere, and it 
probably bears some discussion about where we'd like to go from here.

I'm thinking we should probably do another 1.0.x release with all of the 
bugfixes we currently have on that branch.

Then, the question is when to start treating the py3 branch as master.  
The only downside on Python 2.x (that I'm aware of) is the dropped 
support for Python < 2.6.  There are still a number of reasons (mainly 
due to external library dependencies) that one may not to run matplotlib 
on Python 3.x, but that's a separate question, IMHO.

The status of the Py3 work is here:

https://github.com/matplotlib/matplotlib-py3/wiki

I would love a Mac user to build and run regression tests on both Python 
2.x and Python 3.x, and run some interactive examples, particularly the 
mac os backend, as I haven't been able to test that personally.

Thoughts?

Mike

-- 
Michael Droettboom
Science Software Branch
Space Telescope Science Institute
Baltimore, Maryland, USA

On Tue, Mar 29, 2011 at 4:06 AM, Nils Wagner
<nw...@ia...> wrote:
> On Tue, 29 Mar 2011 10:01:34 +0200
>  "Nils Wagner" <nw...@ia...> wrote:
>> Hi all,
>>
>> I am using the latest matplotlib.
>> How can I resolve the following problem ?
>>
>>>>> import matplotlib
>> Traceback (most recent call last):
>>   File "<stdin>", line 1, in <module>
>>   File
>> "/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/__init__.py",
>> line 133, in <module>
>>     from matplotlib.rcsetup import (defaultParams,
>>   File
>> "/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/rcsetup.py",
>> line 19, in <module>
>>     from matplotlib.colors import is_color_like
>>   File
>> "/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/colors.py",
>> line 54, in <module>
>>     import matplotlib.cbook as cbook
>>   File
>> "/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/cbook.py",
>> line 453, in <module>
>>     class ViewVCCachedServer(urllib2.HTTPSHandler):
>> AttributeError: 'module' object has no attribute
>> 'HTTPSHandler'
>>
>> Thanks in advance
>>                                                Nils
>
>
>> >>> dir (urllib2)
> ['AbstractBasicAuthHandler', 'AbstractDigestAuthHandler',
> 'AbstractHTTPHandler', 'BaseHandler', 'CacheFTPHandler',
> 'FTPHandler', 'FileHandler', 'GopherError',
> 'GopherHandler', 'HTTPBasicAuthHandler',
> 'HTTPCookieProcessor', 'HTTPDefaultErrorHandler',
> 'HTTPDigestAuthHandler', 'HTTPError',
> 'HTTPErrorProcessor', 'HTTPHandler', 'HTTPPasswordMgr',
> 'HTTPPasswordMgrWithDefaultRealm', 'HTTPRedirectHandler',
> 'OpenerDirector', 'ProxyBasicAuthHandler',
> 'ProxyDigestAuthHandler', 'ProxyHandler', 'Request',
> 'StringIO', 'URLError', 'UnknownHandler', '__builtins__',
> '__doc__', '__file__', '__name__', '__version__',
> '_cut_port_re', '_opener', '_parse_proxy', 'addinfourl',
> 'base64', 'bisect', 'build_opener', 'ftpwrapper',
> 'getproxies', 'hashlib', 'httplib', 'install_opener',
> 'localhost', 'mimetools', 'noheaders', 'os',
> 'parse_http_list', 'parse_keqv_list', 'posixpath',
> 'quote', 'random', 'randombytes', 're', 'request_host',
> 'socket', 'splitattr', 'splitgophertype', 'splithost',
> 'splitpasswd', 'splitport', 'splitquery', 'splittype',
> 'splituser', 'splitvalue', 'sys', 'time', 'unquote',
> 'unwrap', 'url2pathname', 'urlopen', 'urlparse']
>>>> urllib2.__version__
> '2.5'

It looks like the changes I made to fetch sample data from github
instead of sourceforge are causing problems if python was not compiled
with SSL support. Comment out ViewVCCachedServer in cbook.py and I'll
figure something out.

On Tue, 29 Mar 2011 10:01:34 +0200
  "Nils Wagner" <nw...@ia...> wrote:
> Hi all,
> 
> I am using the latest matplotlib.
> How can I resolve the following problem ?
> 
>>>> import matplotlib
> Traceback (most recent call last):
>   File "<stdin>", line 1, in <module>
>   File 
> "/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/__init__.py", 
> line 133, in <module>
>     from matplotlib.rcsetup import (defaultParams,
>   File 
> "/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/rcsetup.py", 
> line 19, in <module>
>     from matplotlib.colors import is_color_like
>   File 
> "/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/colors.py", 
> line 54, in <module>
>     import matplotlib.cbook as cbook
>   File 
> "/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/cbook.py", 
> line 453, in <module>
>     class ViewVCCachedServer(urllib2.HTTPSHandler):
> AttributeError: 'module' object has no attribute 
> 'HTTPSHandler'
>  
> Thanks in advance
>                                                Nils


> >>> dir (urllib2)
['AbstractBasicAuthHandler', 'AbstractDigestAuthHandler', 
'AbstractHTTPHandler', 'BaseHandler', 'CacheFTPHandler', 
'FTPHandler', 'FileHandler', 'GopherError', 
'GopherHandler', 'HTTPBasicAuthHandler', 
'HTTPCookieProcessor', 'HTTPDefaultErrorHandler', 
'HTTPDigestAuthHandler', 'HTTPError', 
'HTTPErrorProcessor', 'HTTPHandler', 'HTTPPasswordMgr', 
'HTTPPasswordMgrWithDefaultRealm', 'HTTPRedirectHandler', 
'OpenerDirector', 'ProxyBasicAuthHandler', 
'ProxyDigestAuthHandler', 'ProxyHandler', 'Request', 
'StringIO', 'URLError', 'UnknownHandler', '__builtins__', 
'__doc__', '__file__', '__name__', '__version__', 
'_cut_port_re', '_opener', '_parse_proxy', 'addinfourl', 
'base64', 'bisect', 'build_opener', 'ftpwrapper', 
'getproxies', 'hashlib', 'httplib', 'install_opener', 
'localhost', 'mimetools', 'noheaders', 'os', 
'parse_http_list', 'parse_keqv_list', 'posixpath', 
'quote', 'random', 'randombytes', 're', 'request_host', 
'socket', 'splitattr', 'splitgophertype', 'splithost', 
'splitpasswd', 'splitport', 'splitquery', 'splittype', 
'splituser', 'splitvalue', 'sys', 'time', 'unquote', 
'unwrap', 'url2pathname', 'urlopen', 'urlparse']
>>> urllib2.__version__
'2.5'
  

Hi all,

I am using the latest matplotlib.
How can I resolve the following problem ?

>>> import matplotlib
Traceback (most recent call last):
   File "<stdin>", line 1, in <module>
   File 
"/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/__init__.py", 
line 133, in <module>
     from matplotlib.rcsetup import (defaultParams,
   File 
"/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/rcsetup.py", 
line 19, in <module>
     from matplotlib.colors import is_color_like
   File 
"/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/colors.py", 
line 54, in <module>
     import matplotlib.cbook as cbook
   File 
"/data/home/nwagner/local/lib/python2.5/site-packages/matplotlib/cbook.py", 
line 453, in <module>
     class ViewVCCachedServer(urllib2.HTTPSHandler):
AttributeError: 'module' object has no attribute 
'HTTPSHandler'
  
Thanks in advance
                                                Nils

Looking forward, supporting the Python 3 compatible PyQt API is likely the  
way to go.

Le , Gerald Storer <gd...@mr...> a écrit :
> On 28/03/2011 1:10 AM, Peter Butterworth wrote:


> Wouldn't it be possible to use a single backend compatible with both

> PyQt and Pyside ?


> The current Qt mpl backend uses the old PyQt slots/signals API which  
> PySide doesn't really support (there are some macros but they don't work  
> 100% the same). From a quick glance at the IPython implementation it  
> looks like they are using the new API which means older versions (<4.5)  
> of PyQt won't be supported. This might be ok, I don't know.

> If it isn't then, there will need to be some try...excepts around the  
> place or separate back ends. If you ignore the PySide bugs I had to work  
> around I've only changed ~4 lines in the main backend.



> Pierre's formlayout is also using an obsolete method that isn't present  
> in PySide. I've opted to emulate it, but it would be best to change the  
> code to use the alternative method available in both PyQt and PySide.  
> formlayout also uses the old QString implementation of PyQt, PySide only  
> supports the new implementation where QString is transparently convert  
> to/from str/unicode. Setting QString = unicode seems to work though.



> Gerald.

On Mon, Mar 28, 2011 at 2:02 PM, Jouni K. Seppänen <jk...@ik...> wrote:

> Jouni K. Seppänen <jk...@ik...> writes:
>
> > I tried to merge my changes into master with the no-op "ours" strategy
> > to prevent exactly this kind of problems while waiting for the other
> > request to move forward, but apparently I didn't do it right. I'll take
> > a look tonight (but right now I must attend to other things).
>
> So I had merged the *feature branch* on which the README.osx and
> make.osx changes were into master with --strategy ours, but not the
> *merge commit* where I merged that feature branch into v1.0.x. I now
> merged the merge commit as well, and it seems to have helped: I was
> able to merge v1.0.x into master with only the conflict in
> installing_faq.rst.
>
> Sorry about the confusion.
>
>
No problem. Thanks for helping with that.  The commit looks good to me.

Ben Root

Jouni K. Seppänen <jk...@ik...> writes:

> I tried to merge my changes into master with the no-op "ours" strategy
> to prevent exactly this kind of problems while waiting for the other
> request to move forward, but apparently I didn't do it right. I'll take
> a look tonight (but right now I must attend to other things).

So I had merged the *feature branch* on which the README.osx and
make.osx changes were into master with --strategy ours, but not the
*merge commit* where I merged that feature branch into v1.0.x. I now
merged the merge commit as well, and it seems to have helped: I was 
able to merge v1.0.x into master with only the conflict in
installing_faq.rst.

Sorry about the confusion.

-- 
Jouni K. Seppänen
http://www.iki.fi/jks

Benjamin Root <ben...@ou...> writes:

> I managed to merge my docfix/improve_description branch over to v1.0.x, but
> I am having trouble merging correctly over to master.  It appears that the
> README.osx and make.osx files were changed in v1.0.x, but not in
> master.  

That was me: those changes don't apply cleanly to master, so I have
another pull request with the corresponding changes. I made some changes
it to recently, and it had not received any comments after that, so I
was hesitant to merge it yet.

I tried to merge my changes into master with the no-op "ours" strategy
to prevent exactly this kind of problems while waiting for the other
request to move forward, but apparently I didn't do it right. I'll take
a look tonight (but right now I must attend to other things).

-- 
Jouni K. Seppänen
http://www.iki.fi/jks

I don't know if a cherry-pick is required -- just someone who understands the changes and knows how the merge should be performed.  Back in the SVN days, we encouraged the authors making changes on the maintenance branch to merge into trunk (master), since they were best equipped to make judgment calls.  Any thoughts on this from the git masters?

Mike
________________________________
From: Benjamin Root [ben...@ou...]
Sent: Monday, March 28, 2011 10:19 AM
To: matplotlib development list
Subject: [matplotlib-devel] problems merging docfixs to master from v1.0.x

Hello all,

I managed to merge my docfix/improve_description branch over to v1.0.x, but I am having trouble merging correctly over to master.  It appears that the README.osx and make.osx files were changed in v1.0.x, but not in master.  So my merge wants me to resolve these differences -- which I am not about ready to do.  There is also some sort of conflict with doc/faq/installing_faq.rst, but that conflict is easy to resolve (change build_dep to build-dep).

Maybe we need to cherry-pick the changes to README.osx and make.osx from v1.0.x to master first?

Thanks,
Ben Root

Hello all,

I just noticed a small change in behavior with 3d plots.  If one creates the
plot in the old way (i.e., "ax = Axes3D(fig)"), the plot will start out
using the entire figure region as it should.  However, once you start to
manipulate it (rotate or whatever), the plot loses its horizontal extent
(but not vertical extent).  The horizontal extent it switches to matches the
default extents for regular subplot axes.

I am sure there is partly some sort of issue in mplot3d that is triggering
this, but I have to wonder if this would impact anybody else using custom
extents for their axes objects.

Thanks,
Ben Root

Yo,

On Mon, Mar 28, 2011 at 8:17 AM, Michael Droettboom <md...@st...> wrote:
> There's also this git command I just discovered.  It seems to solve all of these issues, and the documentation is written in the same crystal-clear style of the other git manpages:
>
> http://wingolog.org/archives/2011/03/28/git-brunch1

It is indeed a stylistic masterpiece.  And then you have the aptly
named and actually useful:

http://git-wt-commit.rubyforge.org/git-wtf

Matthew

There's also this git command I just discovered.  It seems to solve all of these issues, and the documentation is written in the same crystal-clear style of the other git manpages:

http://wingolog.org/archives/2011/03/28/git-brunch1

Mike
________________________________________
From: Paul Ivanov [piv...@gm...]
Sent: Thursday, March 24, 2011 8:20 PM
To: mat...@li...
Subject: Re: [matplotlib-devel] I screwed up matplotlib/master on github

Matthew Brett, on 2011-03-24 16:37,  wrote:
> Welcome to the wonderful world of git and DVCS!

Thanks, I wish I could claim that I only started using git
recently, but I've just sort of been uncomfortably trying my best
to not cause too much trouble for the past year and a half...
>
> I think you could have solved this one by:
>
> git reset --hard 8506c33c811e970c6aa73a446d3ed223ac48f989
>
> and pushing that.  Assuming you had that commit, which I guess you would have.

This actually wasn't the case - I hadn't pulled from
matplotlib/master for a few days, hence the stale commit become a
head after my push.

> The way I try and avoid doing that very easy thing is
>
> 1) Having a moderately frightening name for the upstream remote like
> 'upstream-rw'.
> 2) Having a moderately frightening name for the tracking branch like:
>
> git co -b main-master --track upstream-rw/master

good tips, thanks.

>
> 3) Making sure I've got the git-completion bash command line
> completion tools working, so I can always see my branch name

This was actually the case for me - I wasn't working on master,
but a seperate branch called 'one-figure' which didn't have a
remote branch affiliated with it (or a wrong one). I had
previously pushed it using 'git push ivanov one-figure', and
*wrongly* assumed that this state was preserved somewhere

16:46@matplotlib(one-figure)$

> 4) Never working on main-master, always branching, and merging when I'm sure.

> 5) Deleting my own master branch to avoid confusion.   This involves:
>
> Going to your github fork, choosing Admin, set default branch to be
> something other than 'master'
>
> git co that-other-branch
> git branch -D master # delete locally
> git push origin :master # delete on github
>
> Every error, is a jewel.

Wise words, but if that were true, De Beers and Tiffany's
couldn't hope to compete with me.

best,
--
Paul Ivanov
314 address only used for lists,  off-list direct email at:
http://pirsquared.org | GPG/PGP key id: 0x0F3E28F7