Preparing for 0.10a1 release

2 files changed, 18 insertions, 13 deletions

diff --git a/scripts/mkrelease.py b/scripts/mkrelease.py
index eb1e14f..36b42b3 100755
--- a/scripts/mkrelease.py
+++ b/scripts/mkrelease.py
@@ -26,7 +26,6 @@ def runcmd(cmd):
 version = nose.__version__
 versioninfo = nose.__versioninfo__
 
-# old: runcmd('bzr branch . ../nose_dev-%s' % version)
 
 os.chdir(svnroot)
 print "cd %s" % svnroot
@@ -64,13 +63,13 @@ runcmd('svn copy %s %s' % (base, tag))
 if os.path.exists(os.path.join(branch, 'setup.cfg')):
     os.chdir(branch)
     print "cd %s" % branch
-    runcmd('svn rm setup.cfg --force') # remove dev tag from setup
+    runcmd('svn cp setup.cfg.release setup.cfg') # remove dev tag from setup
     print "cd %s" % svnroot
     os.chdir(svnroot)
     
 os.chdir(tag)
 print "cd %s" % tag
-runcmd('svn rm setup.cfg --force') # remove dev tag from setup
+runcmd('svn cp setup.cfg.release setup.cfg') # remove dev tag from setup
 
 # check in
 os.chdir(branchroot)
@@ -87,6 +86,7 @@ os.chdir(tag)
 print "cd %s" % tag
 
 runcmd('scripts/mkindex.py')
+runcmd('scripts/mkdocs.py')
 runcmd('scripts/mkwiki.py')
 
 # setup sdist
@@ -94,10 +94,14 @@ runcmd('python setup.py sdist')
 
 # upload index.html, new dist version, new branch
 # link current to dist version
-if os.environ.has_key('NOSE_UPLOAD'):
-    cmd = ('scp -C dist/nose-%(version)s.tar.gz '
-           'index.html %(upload)s') % {'version':version,
-                                       'upload': os.environ['NOSE_UPLOAD'] }
+if 'NOSE_UPLOAD' in os.environ:
+    cv = {'version':version,
+          'uoload': os.environ['NOSE_UPLOAD'],
+          'upload_docs': "%s/%s" % (os.environ['NOSE_UPLOAD'], version) }
+    cmd = 'scp -C dist/nose-%(version)s.tar.gz %(upload)s' % cv
     runcmd(cmd)
-           
+
+    cmd = 'scp -Cr index.html doc %(upload_docs)s') % cv
+    runcmd(cmd)
+    
 os.chdir(current)
diff --git a/scripts/mkwiki.py b/scripts/mkwiki.py
index d2a214b..f7b2094 100755
--- a/scripts/mkwiki.py
+++ b/scripts/mkwiki.py
@@ -5,6 +5,8 @@ from docutils.core import publish_string, publish_parts
 from docutils.nodes import SparseNodeVisitor
 from docutils.readers.standalone import Reader
 from docutils.writers import Writer
+from nose.config import Config
+from nose.plugins.manager import BuiltinPluginManager
 import nose
 import os
 import pudge.browser
@@ -13,6 +15,7 @@ import sys
 import textwrap
 import time
 
+
 # constants
 success = 0
 div = '\n----\n'
@@ -220,11 +223,9 @@ def tools():
 
 
 def usage():
-    doc = nose.core.TestProgram.__doc__.replace("\\", "\\\\")
-    parser = nose.core.get_parser(env={}, builtin_only=True, doc=doc)
-    out = '{{{\n' + \
-          parser.format_help().replace('mkwiki.py', 'nosetests') + \
-          '\n}}}\n'
+    conf = Config(plugins=BuiltinPluginManager())
+    usage_text = conf.help(nose.main.__doc__).replace('mkwiki.py', 'nosetests')
+    out = '{{{\n%s\n}}}\n' % usage_text
     return out