Merging -r 1189 from lp:ipython.

IPython/core/release.py

@@ -1,121 +1,121 b''
 # -*- coding: utf-8 -*-
 """Release data for the IPython project."""
 
 #*****************************************************************************
 #       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).
 
-development = True    # change this to False to do a release
-version_base = '0.10'
+development = False    # change this to False to do a release
+version_base = '0.10.rc1'
 branch = 'ipython'
-revision = '1163'
+revision = '1188'
 
 if development:
     if branch == 'ipython':
         version = '%s.bzr.r%s' % (version_base, revision)
     else:
         version = '%s.bzr.r%s.%s' % (version_base, revision, branch)
 else:
     version = version_base
 
 
 description = "An interactive computing environment for Python"
 
 long_description = \
 """
 The goal of IPython is to create a comprehensive environment for
 interactive and exploratory computing.  To support this goal, IPython
 has two main components:
 
 * An enhanced interactive Python shell.
 
 * An architecture for interactive parallel computing.
 
 The enhanced interactive Python shell has the following 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 and wxPython GUIs.
 
 * Integrated access to the pdb debugger and the Python profiler. 
 
 The parallel computing architecture has the following main features:
 
 * Quickly parallelize Python code from an interactive Python/IPython session.
 
 * A flexible and dynamic process model that be deployed on anything from 
   multicore workstations to supercomputers.
 
 * An architecture that supports many different styles of parallelism, from
   message passing to task farming.
 
 * Both blocking and fully asynchronous interfaces.
 
 * High level APIs that enable many things to be parallelized in a few lines
   of code.
 
 * Share live parallel jobs with other users securely.  
 
 * Dynamically load balanced task farming system.
 
 * Robust error handling in parallel code.
 
 The latest development version is always available from IPython's `Launchpad 
 site <http://launchpad.net/ipython>`_.
 """
 
 license = 'BSD'
 
 authors = {'Fernando' : ('Fernando Perez','[e-mail]'),
            'Janko'    : ('Janko Hauser','[e-mail]'),
            'Nathan'   : ('Nathaniel Gray','[e-mail]'),
            'Ville'    : ('Ville Vainio','[e-mail]'),
            'Brian'    : ('Brian E Granger', '[e-mail]'),
            'Min'      : ('Min Ragan-Kelley', '[e-mail]')
            }
 
 author = 'The IPython Development Team'
 
 author_email = '[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','Parallel','Distributed']

tools/check_sources.py

@@ -1,15 +1,32 b''
+#!/usr/bin/env python
+"""Utility to look for hard tabs and \r characters in all sources.
+"""
+
 from IPython.external.path import path
+
 fs = path('..').walkfiles('*.py')
 
+rets = []
+
 for f in fs:
     errs = ''
     cont = f.bytes()
     if '\t' in cont:
         errs+='t'
 
     if '\r' in cont:
         errs+='r'
+        rets.append(f)
         
     if errs:
         print "%3s" % errs, f
-    
+        if 't' in errs:
+            for ln,line in enumerate(f.lines()):
+                if '\t' in line:
+                    print 'TAB:',ln,':',line,
+        if 'r' in errs:
+            for ln,line in enumerate(open(f.abspath(),'rb')):
+                if '\r' in line:
+                    print 'RET:',ln,':',line,
+
+rr = rets[-1]

tools/release

@@ -1,58 +1,35 b''
-#!/bin/sh
+#!/bin/bash
 # 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 "=================================="
 
 # Perform local backup
 cd $ipdir/tools
 ./make_tarball.py
 mv ipython-*.tgz $ipbackupdir
 
-# Clean up build/dist directories
-rm -rf $ipdir/build/*
-rm -rf $ipdir/dist/*
-
-# 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 ./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
+# Build release files
+./testrel $ipdir
 
 # 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 $ipbackupdir
 scp `ls -1tr *tgz | tail -1` [e-mail]:www/backup/
 
 echo "Done!"

tools/testrel

@@ -1,31 +1,35 b''
-#!/bin/sh
+#!/bin/bash
 
-# release test
+# Build the release files.  Kept as a separate script so we can easily do local
+# dry runs without uploading anything externally.
 
-ipdir=$PWD/..
+ipdir=${1-..}
 
 cd $ipdir
 
 # Clean up build/dist directories
-rm -rf $ipdir/build/*
-rm -rf $ipdir/dist/*
+rm -rf build/*
+rm -rf dist/*
+rm -rf docs/build/*
+rm -rf docs/dist/*
 
-# build source distros
-cd $ipdir
+# Build source and binary distros
 ./setup.py sdist --formats=gztar
 
-# Build rpms
-python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4
+# 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.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5
+python2.6 ./setup.py bdist_rpm --binary-only --release=py26 --python=/usr/bin/python2.6
 
 # Build eggs
-python2.4 ./setup_bdist_egg.py
 python2.5 ./setup_bdist_egg.py
+python2.6 ./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
+rename 's/win32/win32-setup/' dist/*.exe