Merging -r 1189 from lp:ipython.

ellisonbg · ellisonbg · commit eaba76cd1903 · 2009-08-03T23:59:37.000-07:00
diff --git a/IPython/core/release.py b/IPython/core/release.py
@@ -20,10 +20,10 @@
 # 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':
diff --git a/tools/check_sources.py b/tools/check_sources.py
@@ -1,6 +1,13 @@
+#!/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()
@@ -9,7 +16,17 @@
 
     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]
diff --git a/tools/release b/tools/release
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # IPython release script
 
 PYVER=`python -V 2>&1 | awk '{print $2}' | awk -F '.' '{print $1$2}' `
@@ -15,31 +15,8 @@ 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..."
diff --git a/tools/testrel b/tools/testrel
@@ -1,31 +1,35 @@
-#!/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
