updates to release guide

jdh2358 · jdh2358 · commit 38b94c481373 · 2008-12-15T14:53:30.000Z
svn path=/trunk/matplotlib/; revision=6611
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
@@ -1,4 +1,4 @@
-.. _coding-guide:
+M.. _coding-guide:
 
 ************
 Coding guide
@@ -29,10 +29,10 @@ Branch checkouts, eg the maintenance branch::
    svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
    v0_91_maint mpl91 --username=youruser --password=yourpass
 
-The current release of the trunk is in the 0.98.4 maintenance branch::
+The current release of the trunk is in the 0.98.5 maintenance branch::
 
    svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
-   v0_98_4_maint mpl98.4 --username=youruser --password=yourpass
+   v0_98_5_maint mpl98.5 --username=youruser --password=yourpass
 
 
 Committing changes
@@ -118,6 +118,9 @@ The basic procedure is:
 
      > svn commit -F svnmerge-commit-message.txt
 
+
+.. _setting-up-svnmerge:
+
 Setting up svnmerge
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst
@@ -9,6 +9,9 @@ A guide for developers who are doing a matplotlib release
 * Edit :file:`__init__.py` and bump the version number
 
 
+
+When doing a release
+
 .. _release-testing:
 
 Testing
@@ -27,6 +30,20 @@ Testing
 * remove font cache and tex cache from :file:`.matplotlib` and test
   with and without cache on some example script
 
+
+.. _release-branching:
+
+Branching
+============
+
+Once all the tests are passing and you are ready to do a release, you
+need to create a release branch and configure svn-merge to use it;
+Michael Droettboom should probably handle this step, but if he is not
+available see instructions at :ref:`setting-up-svnmerge`.  On the
+bracnh, do any additional testing you want to do, and then build
+binaries and source distributions for testing as release candidates.
+
+
 .. _release-packaging:
 
 Packaging
@@ -57,11 +74,35 @@ Packaging
 
       > svn copy trunk/matplotlib branches/v0_98_4_maint
 
+
+.. _release-candidate-testing:
+
+Release candidate testing:
+============================
+
+Post the release candidates to
+http://matplotlib.sf.net/release-candidates and post a message to
+matplotlib-users and devel requesting testing.  To post to the server,
+you can do::
+
+    > scp somefile.tgz jdh2358,matplotlib@shell.sf.net:/home/groups/m/ma/matplotlib/htdocs/release-candidates/
+
+replacing 'jdh2358' with your sourceforge login.
+
+
+Any changes to fix bugs in the release candidate should be fixed in
+the release branch and merged into the trunk with svn-merge; see
+:ref:`svn-merge`.  When the release candidate is signed off on, build
+the final sdist, binaries and eggs, and upload them to the sourceforge
+release area.
+
+
 .. _release-uploading:
 
 Uploading
 =========
 
+
 * Post the win32 and OS-X binaries for testing and make a request on
   matplotlib-devel for testing.  Pester us if we don't respond
 
