I've been away on vacation -- just to confirm, it looks like Benjamin Root (@WeatherGod) has already got around to doing this?
Mike On 12/27/2011 03:07 PM, Jouni K. Seppänen wrote: > I had some time to work on matplotlib, and created pull request #633 to > fix a bug reported recently. I branched off v1.1.x since the fix is > small and self-contained, and thought I'd create a different branch for > master, where the relevant code has changed a little. (What should the > process be in this kind of cases?) > > However, it seems that v1.1.x has diverged from master: > > commit 2da9d8fb5d087eaeb31c0af88141aafaf0716e9c > Merge: 3c3c466 585606f > Author: Eric Firing<efir...@hawaii.edu> > Date: Wed Dec 14 10:01:53 2011 -0800 > > Merge pull request #627 from efiring/quiver_angle > > Quiver: copy input angles array to avoid side effects; fixes issue #625 > > commit 3c3c466564cba3d80f928a46857e54738787779b > Merge: 96caca8 fb52b96 > Author: Michael Droettboom<mdb...@gmail.com> > Date: Wed Dec 14 06:10:26 2011 -0800 > > Merge pull request #586 from mdboom/numpy-version-13 > > Numpy version 1.4 > > commit 585606f7bd79b93cbaa9d538cbf537c82cb9a4a6 > Author: Eric Firing<efir...@hawaii.edu> > Date: Tue Dec 13 07:53:54 2011 -1000 > > Quiver: copy input angles array to avoid side effects; fixes issue #625 > > commit fb52b961a596c41fa2a1bb2dd85d7078f2ad39de > Author: Michael Droettboom<mdb...@gmail.com> > Date: Mon Nov 14 14:42:28 2011 -0500 > > Put the minimum required version of Numpy in one place. > > commit bf73b9088e0ce5e2dfcc5b2cac9a4f20515ed9f2 > Author: Michael Droettboom<mdb...@gmail.com> > Date: Mon Nov 14 08:31:34 2011 -0500 > > Update checks and documentation to refer to Numpy 1.4 as the minimum > Numpy version. > > I presume all of these changes are wanted on master, but the branch > doesn't merge cleanly. It would probably be best if the author of each > change did the merging into master, since they know best how to resolve > any merge conflicts. I can make a suggested merge as a pull request, but > it would be best if Eric and Michael reviewed it. > ------------------------------------------------------------------------------ Write once. Port to many. Get the SDK and tools to simplify cross-platform app development. Create new or port existing apps to sell to consumers worldwide. Explore the Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join http://p.sf.net/sfu/intel-appdev _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
