Fixes to build/doc scripts.

IPython/Release.py

@@ -1,89 +1,89 b''
 # -*- coding: utf-8 -*-
 """Release data for the IPython project.
 
 $Id: Release.py 3002 2008-02-01 07:17:00Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez <[e-mail]>
 #
 #       Copyright (c) 2001 Janko Hauser <[e-mail]> and Nathaniel Gray
 #       <[e-mail]>
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
 # Name of the package for release purposes.  This is the name which labels
 # the tarballs and RPMs made by distutils, so it's best to lowercase it.
 name = 'ipython'
 
 # For versions with substrings (like 0.6.16.svn), use an extra . to separate
 # the new substring.  We have to avoid using either dashes or underscores,
 # because bdist_rpm does not accept dashes (an RPM) convention, and
 # bdist_deb does not accept underscores (a Debian convention).
 
-revision = '117'
+revision = '83'
 branch = 'ipython'
 
 if branch == 'ipython':
     version = '0.8.3.bzr.r' + revision
 else:
     version = '0.8.3.bzr.r%s.%s'  % (revision,branch)
 
 version = '0.8.3'
 
 description = "An enhanced interactive Python shell."
 
 long_description = \
 """
 IPython provides a replacement for the interactive Python interpreter with
 extra functionality.
 
 Main features:
 
  * Comprehensive object introspection.
 
  * Input history, persistent across sessions.
 
  * Caching of output results during a session with automatically generated
    references.
 
  * Readline based name completion.
 
  * Extensible system of 'magic' commands for controlling the environment and
    performing many tasks related either to IPython or the operating system.
 
  * Configuration system with easy switching between different setups (simpler
    than changing $PYTHONSTARTUP environment variables every time).
 
  * Session logging and reloading.
 
  * Extensible syntax processing for special purpose situations.
 
  * Access to the system shell with user-extensible alias system.
 
  * Easily embeddable in other Python programs.
 
  * Integrated access to the pdb debugger and the Python profiler. 
 
  The latest development version is always available at the IPython subversion
  repository_.
 
 .. _repository: http://ipython.scipy.org/svn/ipython/ipython/trunk#egg=ipython-dev
  """
 
 license = 'BSD'
 
 authors = {'Fernando' : ('Fernando Perez','[e-mail]'),
            'Janko'    : ('Janko Hauser','[e-mail]'),
            'Nathan'   : ('Nathaniel Gray','[e-mail]'),
            'Ville'    : ('Ville Vainio','[e-mail]')           
            }
 
 url = 'http://ipython.scipy.org'
 
 download_url = 'http://ipython.scipy.org/dist'
 
 platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
 
 keywords = ['Interactive','Interpreter','Shell']

MANIFEST.in

@@ -1,36 +1,36 b''
 include README_Windows.txt
 include win32_manual_post_install.py
 include ipython.py
 
 graft scripts
 
 graft setupext
 
 graft IPython/UserConfig
 
 graft doc
 exclude doc/*.1
 exclude doc/manual_base*
 exclude doc/ChangeLog.*
 exclude doc/\#*
 exclude doc/update_magic.sh
 exclude doc/update_version.sh
 exclude doc/manual_base*
 exclude doc/manual/WARNINGS
 exclude doc/manual/*.aux
 exclude doc/manual/*.log
 exclude doc/manual/*.out
 exclude doc/manual/*.pl
 exclude doc/manual/*.tex
-exclude doc/build/doctrees/*
-exclude doc/build/latex/*
-exclude doc/build/html/_sources/*
+exclude doc/build
+exclude doc/attic
 
 
 
 
 global-exclude *~
 global-exclude *.flc
 global-exclude *.pyc
 global-exclude .dircopy.log
 global-exclude .svn
+global-exclude .bzr

doc/do_sphinx.py

@@ -1,64 +1,74 b''
+#!/usr/bin/env python
+"""Script to build documentation using Sphinx.
+"""
+
 import fileinput,os,sys
 
 def oscmd(c):
     os.system(c)
 
 # html manual.
 oscmd('sphinx-build -d build/doctrees source build/html')
 
 if sys.platform != 'win32':
     # LaTeX format.
     oscmd('sphinx-build -b latex -d build/doctrees source build/latex')
 
     # Produce pdf.
+    topdir = os.getcwd()
     os.chdir('build/latex')
 
     # Change chapter style to section style: allows chapters to start on 
     # the current page.  Works much better for the short chapters we have.
     # This must go in the class file rather than the preamble, so we modify 
     # manual.cls at runtime.
     chapter_cmds=r'''
 % Local changes.
 \renewcommand\chapter{
     \thispagestyle{plain}
     \global\@topnum\z@
     \@afterindentfalse
     \secdef\@chapter\@schapter
 }
 \def\@makechapterhead#1{
     \vspace*{10\p@}
     {\raggedright \reset@font \Huge \bfseries \thechapter \quad #1}
     \par\nobreak
     \hrulefill
     \par\nobreak
     \vspace*{10\p@}
 }
 \def\@makeschapterhead#1{
     \vspace*{10\p@}
     {\raggedright \reset@font \Huge \bfseries #1}
     \par\nobreak
     \hrulefill
     \par\nobreak
     \vspace*{10\p@}
 }
 '''
 
     unmodified=True
     for line in fileinput.FileInput('manual.cls',inplace=1):
         if 'Support for module synopsis' in line and unmodified:
             line=chapter_cmds+line
         elif 'makechapterhead' in line:
             # Already have altered manual.cls: don't need to again.
             unmodified=False
         print line,
 
     # Copying the makefile produced by sphinx...
     oscmd('pdflatex ipython.tex')
     oscmd('pdflatex ipython.tex')
     oscmd('pdflatex ipython.tex')
     oscmd('makeindex -s python.ist ipython.idx')
     oscmd('makeindex -s python.ist modipython.idx')
     oscmd('pdflatex ipython.tex')
     oscmd('pdflatex ipython.tex')
-    oscmd('cp ipython.pdf ../html')
-    os.chdir('../..')
+
+    # Create a manual/ directory with final html/pdf output
+    os.chdir(topdir)
+    oscmd('rm -rf manual')
+    oscmd('mkdir manual')
+    oscmd('cp -r build/html/*.html build/html/_static manual/')
+    oscmd('cp build/latex/ipython.pdf manual/')

tools/make_tarball.py

@@ -1,33 +1,36 b''
-import os,sys,shutil
+#!/usr/bin/env python
+"""Simple script to create a tarball with proper bzr version info.
+"""
 
+import os,sys,shutil
 
 basever = '0.8.3'
 
 def oscmd(c):
     print ">",c
     s = os.system(c)
     if s:
         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('python 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'])
     
 oscmd('bzr export ' + tarname)
 

tools/mkrel.py

@@ -1,50 +1,48 b''
-""" Create ipykit and exe installer
+#!/usr/bin/env python
+"""IPython release script
 
-requires py2exe
+Create ipykit and exe installer
 
+requires py2exe
 """
-#!/bin/sh
-# IPython release script
-
 
 import os
 import distutils.dir_util
 import sys
 
 execfile('../IPython/Release.py')
 
 def c(cmd):
     print ">",cmd
     os.system(cmd)
 
 ipykit_name = "ipykit-%s" % version
 
-
 os.chdir('..')
 if os.path.isdir('dist'):
     distutils.dir_util.remove_tree('dist')
 if os.path.isdir(ipykit_name):
     distutils.dir_util.remove_tree(ipykit_name)
 
 if sys.platform == 'win32':
     c("python exesetup.py py2exe")
 
     os.rename('dist',ipykit_name)
 
     c("zip -r %s.zip %s" % (ipykit_name, ipykit_name))
 
 # Build source and binary distros
 c('./setup.py sdist --formats=gztar')
 
 c("python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4")
 c("python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5")
 
 # Build eggs
 c('python2.4 ./eggsetup.py bdist_egg')
 c('python2.5 ./eggsetup.py bdist_egg')
 
 c("python setup.py bdist_wininst --install-script=ipython_win_post_install.py")
 
 os.chdir('tools')
 c('python make_tarball.py')
 

tools/release

@@ -1,99 +1,101 b''
 #!/bin/sh
 # IPython release script
 
 PYVER=`python -V 2>&1 | awk '{print $2}' | awk -F '.' '{print $1$2}' `
 version=`ipython -Version`
 ipdir=~/ipython/ipython
+ipbackupdir=~/ipython/backup
 
 echo
 echo "Releasing IPython version $version"
 echo "=================================="
 
 echo "Marking ChangeLog with release information and making NEWS file..."
 
 # Stamp changelog and save a copy of the status at each version, in case later
 # we want the NEWS file to start from a point before the very last release (if
 # very small interim releases have no significant changes).
 
 cd $ipdir/doc
 cp ChangeLog ChangeLog.old
 cp ChangeLog ChangeLog.$version
 daystamp=`date +%Y-%m-%d`
 echo $daystamp " ***" Released version $version > ChangeLog
 echo >> ChangeLog
 cat ChangeLog.old >> ChangeLog
 rm ChangeLog.old
 
 # Build NEWS file
 echo "Changes between the last two releases (major or minor)" > NEWS
 echo "Note that this is an auto-generated diff of the ChangeLogs" >> NEWS
 echo >> NEWS
 diff ChangeLog.previous ChangeLog | grep -v '^0a' | sed 's/^> //g' >> NEWS
 cp ChangeLog ChangeLog.previous
 
 # Clean up build/dist directories
 rm -rf $ipdir/build/*
 rm -rf $ipdir/dist/*
 
 # Perform local backup
 cd $ipdir/tools
-./bkp.sh
+./make_tarball.py
+mv ipython-*.tgz $ipbackupdir
 
 # Build source and binary distros
 cd $ipdir
 ./setup.py sdist --formats=gztar
 
 # Build version-specific RPMs, where we must use the --python option to ensure
 # that the resulting RPM is really built with the requested python version (so
 # things go to lib/python2.X/...)
 python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4
 python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5
 
 # Build eggs
-python2.4 ./eggsetup.py bdist_egg
-python2.5 ./eggsetup.py bdist_egg
+python2.4 ./setup_bdist_egg.py
+python2.5 ./setup_bdist_egg.py
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
 # bdist_wininst)
 ./setup.py bdist_wininst --install-script=ipython_win_post_install.py
 
 # Change name so retarded Vista runs the installer correctly
 rename 's/win32/win32-setup/' $ipdir/dist/*.exe
 
 # Register with the Python Package Index (PyPI)
 echo "Registering with PyPI..."
 cd $ipdir
 ./setup.py register
 
 # Upload all files
 cd $ipdir/dist
 echo "Uploading distribution files..."
 scp * [e-mail]:www/dist/
 
 echo "Uploading backup files..."
-cd ~/ipython/backup
+cd $ipbackupdir
 scp `ls -1tr | tail -1` [e-mail]:www/backup/
 
 echo "Updating webpage..."
 cd $ipdir/doc
 www=~/ipython/homepage
 cp ChangeLog NEWS $www
 rm -rf $www/doc/*
 cp -r manual.pdf manual/ $www/doc
 cd $www
 ./update
 
 # Alert package maintainers
 echo "Alerting package maintainers..."
-maintainers='[e-mail] [e-mail] [e-mail] [e-mail] [e-mail] [e-mail]'
-#maintainers='[e-mail]'
+#maintainers='[e-mail] [e-mail] [e-mail] [e-mail] [e-mail] [e-mail]'
+maintainers='[e-mail]'
 
 for email in $maintainers
     do
 	echo "Emailing $email..."
 	mail -s "[Package maintainer notice] A new IPython is out. Version: $version" \
     $email < NEWS
     done
 
 echo "Done!"

tools/testrel

@@ -1,28 +1,28 b''
 #!/bin/sh
 
 # release test
 
 cd ~/ipython/ipython
 
 # clean up build/dist directories
 rm -rf build/*
 rm -rf dist/*
 
 # build source distros
 ./setup.py sdist --formats=gztar
 
 # Build rpms
 python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4
 python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5
 
 # Build eggs
-python2.4 ./eggsetup.py bdist_egg
-python2.5 ./eggsetup.py bdist_egg
+python2.4 ./setup_bdist_egg.py
+python2.5 ./setup_bdist_egg.py
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
 # bdist_wininst)
 ./setup.py bdist_wininst --install-script=ipython_win_post_install.py
 
 # Change name so retarded Vista runs the installer correctly
 rename 's/win32/win32-setup/' dist/*.exe