make_tarball now creates the tarball from bzr with rev & branch info

IPython/Release.py

@@ -22,7 +22,7 b" name = 'ipython'"
 # because bdist_rpm does not accept dashes (an RPM) convention, and
 # bdist_deb does not accept underscores (a Debian convention).
 
-revision = '46'
+revision = '54'
 
 version = '0.8.3.bzr.r' + revision
 

tools/make_tarball.py

@@ -1,12 +1,7 b''
 import os,sys,shutil
 
-repo = "http://ipython.scipy.org/svn/ipython/ipython/branches/0.7.3"
-basename = 'ipython'
-workdir = './mkdist'
-
-workdir = os.path.abspath(workdir)
+basever = '0.8.3'
 
-print "working at",workdir
 def oscmd(c):
     print ">",c
     s = os.system(c)
@@ -14,15 +9,24 b' def oscmd(c):'
         print "Error",s
         sys.exit(s)
 
+def verinfo():
+    
+    out = os.popen('bzr version-info')
+    pairs = (l.split(':',1) for l in out)
+    d = dict(((k,v.strip()) for (k,v) in pairs)) 
+    return d
+
+basename = 'ipython'
+
+#tarname = '%s.r%s.tgz' % (basename, ver)
+oscmd('update_revnum.py')
+
+ver = verinfo()
+
+if ver['branch-nick'] == 'ipython':
+    tarname = 'ipython-%s.bzr.r%s.tgz' % (basever, ver['revno'])
+else:
+    tarname = 'ipython-%s.bzr.r%s.%s.tgz' % (basever, ver['revno'], ver['branch-nick'])
 
-assert not os.path.isdir(workdir)
-os.mkdir(workdir)
-os.chdir(workdir)
+oscmd('bzr export ' + tarname)
 
-oscmd('svn export %s %s' % (repo,basename))
-ver = os.popen('svnversion ../..').read().strip()
-tarname = '%s.r%s.tgz' % (basename, ver)
-oscmd('tar czvf ../%s %s' % (tarname, basename))
-print "Produced: ",os.path.abspath('../' + tarname)
-os.chdir('/')
-shutil.rmtree(workdir)