Cherry-picked commits from 0.12.1 release #1642
Conversation
Reorganized for clarity and provide fewer paths through the document.
| required though. More information about :mod:`setuptools` can be found on its | ||
| website. | ||
| the most simple method of installing IPython and its dependencies. More | ||
| information about :mod:`distribute` can be found on its website. |
There was a problem hiding this comment.
Yup, fixing now (to actually read 'on its PyPI page', with link, since that seems to be the authoritative site).
|
I'm actually going to rebase the PR to avoid having setup2/3 show up at all. Will do it here and will push shortly. |
|
Thanks for the tip, will do. Right now I got some conflicts on the rebase, so I'm cleaning that up. |
Conflicts: docs/source/whatsnew/github-stats-0.12.txt docs/source/whatsnew/version0.12.txt
We should instead make it a URL shortcut, but I don't know how to do that with the Windows APIs. As per review by @minrk.
note for tracking unminified js sources
|
OK, rebased to avoid resurrecting setup2/3 unnecessarily, and cherry-picked your suggestions above. Addressed other points I knew how to handle (I don't know to create a meta-target 'all' for setuptools dependencies). |
| @@ -2,7 +2,7 @@ | |||
| """Release data for the IPython project.""" | |||
|
|
|||
| #----------------------------------------------------------------------------- | |||
| # Copyright (c) 2008-2011, IPython Development Team. | |||
| # Copyright (c) 2008-2012, IPython Development Team. | |||
There was a problem hiding this comment.
According to #1644 this should now be 2008 only... :-)
There was a problem hiding this comment.
Correct, might as well fix that now since I am changing that file, thanks. In my defense, I wrote this before we had the discussion :)
|
So copyright date is the only thing between this and merge, right? |
|
Done, pushed. |
|
Thanks, looks good. Merging. |
Cherry-picked commits from 0.12.1 release Principally documentation and build/release tweaks.
|
Great, thanks! |
Cherry-picked commits from 0.12.1 release Principally documentation and build/release tweaks.
At release time, there are always a bunch of little things that I end up fixing, and it's not practical to hold up the actual release to review them (we'd never release, basically). But now that 0.12.1 is out, it's worth reviewing those changes for 0.13, since we're in no hurry. I applied only the commits I made today during the release work, so most of this should be very safe.