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 investigate and repair it, that would be > fantastic, but I'm afraid to touch it myself. > > Mike
Mike, all: Suggestion: Let's just abandon the v1.0.x branch, stabilize master, and get a release out. (Easy for me to say--I have never contributed to the actual release process.) I think that we really need to get releases out more frequently--that needs to become a higher priority. I don't think it is even worth the trouble to maintain a maintenance branch at all. It adds quite a bit of complexity to the development and release process--every time a bug is found, the fix has to be developed on maintenance, committed and pushed, checked on master, and propagated to master. It's not worth it. The differences between master and maintenance are normally not large enough to justify keeping them separate, given our very constrained people-time resources. Note that a release doesn't have to be made from master HEAD; git branching is extremely flexible, so at any time, one can make a branch from any point on the tree, do some checking and adjustment, and release it. Where we get into difficulty and waste time is in trying to maintain a separate maintenance branch for a long period. We just don't have the resources to do this well; and we don't really need to do it at all. Eric > > On 06/01/2011 02:10 PM, Benjamin Root wrote: >> 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 branch. >> >> Anybody have any clues what went wrong? >> >> Thanks, >> Ben Root ------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Data protection magic? Nope - It's vRanger. Get your free trial download today. http://p.sf.net/sfu/quest-sfdev2dev _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
