diff --git a/IPython/Release.py b/IPython/Release.py index 35ece4f..c77a643 100644 --- a/IPython/Release.py +++ b/IPython/Release.py @@ -23,9 +23,9 @@ name = 'ipython' # bdist_deb does not accept underscores (a Debian convention). development = False # change this to False to do a release -version_base = '0.9.beta3' +version_base = '0.9.rc1' branch = 'ipython' -revision = '1106' +revision = '1124' if development: if branch == 'ipython': diff --git a/docs/Makefile b/docs/Makefile index af3416e..506264b 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -28,17 +28,16 @@ help: @echo "dist all, and then puts the results in dist/" clean: - -rm -rf build/* + -rm -rf build/* dist/* pdf: latex cd build/latex && make all-pdf all: html pdf -dist: all +dist: clean all mkdir -p dist - -rm -rf dist/* - ln build/latex/IPython.pdf dist/ + ln build/latex/ipython.pdf dist/ cp -al build/html dist/ @echo "Build finished. Final docs are in dist/" diff --git a/docs/source/changes.txt b/docs/source/changes.txt index 3b670c3..ffa88a6 100644 --- a/docs/source/changes.txt +++ b/docs/source/changes.txt @@ -27,6 +27,11 @@ Release 0.9 New features ------------ +* Laurent's WX application has been given a top-level script called ipython-wx, + and it has received numerous fixes. We expect this code to be + architecturally better integrated with Gael's WX 'ipython widget' over the + next few releases. + * The Editor synchronization work by Vivian De Smedt has been merged in. This code adds a number of new editor hooks to synchronize with editors under Windows. diff --git a/docs/source/conf.py b/docs/source/conf.py index fe2b209..ca5a31d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -150,11 +150,11 @@ latex_font_size = '11pt' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). -latex_documents = [ ('index', 'IPython.tex', 'IPython Documentation', +latex_documents = [ ('index', 'ipython.tex', 'IPython Documentation', ur"""Brian Granger, Fernando Pérez and Ville Vainio\\ \ \\ With contributions from:\\ - Benjamin Ragan-Kelley.""", + Benjamin Ragan-Kelley and Barry Wark.""", 'manual'), ] diff --git a/setup.py b/setup.py index 59380f4..1c905c4 100755 --- a/setup.py +++ b/setup.py @@ -88,28 +88,39 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'): "cd docs/man && gzip -9c pycolor.1 > pycolor.1.gz"), ] - # Only build the docs is sphinx is present + # Only build the docs if sphinx is present try: import sphinx except ImportError: pass else: - pass - # BEG: This is disabled as I am not sure what to depend on. - # I actually don't think we should be automatically building - # the docs for people. - # The do_sphinx scripts builds html and pdf, so just one - # target is enough to cover all manual generation - # to_update.append( - # ('docs/manual/ipython.pdf', - # ['IPython/Release.py','docs/source/ipython.rst'], - # "cd docs && python do_sphinx.py") - # ) + # The Makefile calls the do_sphinx scripts to build html and pdf, so + # just one target is enough to cover all manual generation + + # First, compute all the dependencies that can force us to rebuild the + # docs. Start with the main release file that contains metadata + docdeps = ['IPython/Release.py'] + # Inculde all the reST sources + pjoin = os.path.join + for dirpath,dirnames,filenames in os.walk('docs/source'): + if dirpath in ['_static','_templates']: + continue + docdeps += [ pjoin(dirpath,f) for f in filenames + if f.endswith('.txt') ] + # and the examples + for dirpath,dirnames,filenames in os.walk('docs/example'): + docdeps += [ pjoin(dirpath,f) for f in filenames + if not f.endswith('~') ] + # then, make them all dependencies for the main PDF (the html will get + # auto-generated as well). + to_update.append( + ('docs/dist/ipython.pdf', + docdeps, + "cd docs && make dist") + ) [ target_update(*t) for t in to_update ] - # Build the docs - os.system('cd docs && make dist') #--------------------------------------------------------------------------- # Find all the packages, package data, scripts and data_files diff --git a/tools/release b/tools/release index 2dea659..c5f2c68 100755 --- a/tools/release +++ b/tools/release @@ -12,26 +12,6 @@ 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/* @@ -77,25 +57,4 @@ echo "Uploading backup files..." cd $ipbackupdir scp `ls -1tr *tgz | tail -1` ipython@ipython.scipy.org:www/backup/ -echo "Updating webpage..." -cd $ipdir/doc -www=~/ipython/homepage -cp ChangeLog NEWS $www -rm -rf $www/doc/* -cp -r manual/ $www/doc -cd $www -./update - -# Alert package maintainers -#echo "Alerting package maintainers..." -#maintainers='fernando.perez@berkeley.edu ariciputi@users.sourceforge.net jack@xiph.org tretkowski@inittab.de dryice@hotpop.com willmaier@ml1.net' -# maintainers='fernando.perez@berkeley.edu' - -# 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!"