Show More
@@ -20,10 +20,10 b" name = 'ipython'" | |||||
20 | # because bdist_rpm does not accept dashes (an RPM) convention, and |
|
20 | # because bdist_rpm does not accept dashes (an RPM) convention, and | |
21 | # bdist_deb does not accept underscores (a Debian convention). |
|
21 | # bdist_deb does not accept underscores (a Debian convention). | |
22 |
|
22 | |||
23 |
development = |
|
23 | development = False # change this to False to do a release | |
24 | version_base = '0.10' |
|
24 | version_base = '0.10.rc1' | |
25 | branch = 'ipython' |
|
25 | branch = 'ipython' | |
26 |
revision = '11 |
|
26 | revision = '1188' | |
27 |
|
27 | |||
28 | if development: |
|
28 | if development: | |
29 | if branch == 'ipython': |
|
29 | if branch == 'ipython': |
@@ -1,6 +1,13 b'' | |||||
|
1 | #!/usr/bin/env python | |||
|
2 | """Utility to look for hard tabs and \r characters in all sources. | |||
|
3 | """ | |||
|
4 | ||||
1 | from IPython.external.path import path |
|
5 | from IPython.external.path import path | |
|
6 | ||||
2 | fs = path('..').walkfiles('*.py') |
|
7 | fs = path('..').walkfiles('*.py') | |
3 |
|
8 | |||
|
9 | rets = [] | |||
|
10 | ||||
4 | for f in fs: |
|
11 | for f in fs: | |
5 | errs = '' |
|
12 | errs = '' | |
6 | cont = f.bytes() |
|
13 | cont = f.bytes() | |
@@ -9,7 +16,17 b' for f in fs:' | |||||
9 |
|
16 | |||
10 | if '\r' in cont: |
|
17 | if '\r' in cont: | |
11 | errs+='r' |
|
18 | errs+='r' | |
|
19 | rets.append(f) | |||
12 |
|
20 | |||
13 | if errs: |
|
21 | if errs: | |
14 | print "%3s" % errs, f |
|
22 | print "%3s" % errs, f | |
|
23 | if 't' in errs: | |||
|
24 | for ln,line in enumerate(f.lines()): | |||
|
25 | if '\t' in line: | |||
|
26 | print 'TAB:',ln,':',line, | |||
|
27 | if 'r' in errs: | |||
|
28 | for ln,line in enumerate(open(f.abspath(),'rb')): | |||
|
29 | if '\r' in line: | |||
|
30 | print 'RET:',ln,':',line, | |||
15 |
|
31 | |||
|
32 | rr = rets[-1] |
@@ -1,4 +1,4 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/bash | |
2 | # IPython release script |
|
2 | # IPython release script | |
3 |
|
3 | |||
4 | PYVER=`python -V 2>&1 | awk '{print $2}' | awk -F '.' '{print $1$2}' ` |
|
4 | PYVER=`python -V 2>&1 | awk '{print $2}' | awk -F '.' '{print $1$2}' ` | |
@@ -15,31 +15,8 b' cd $ipdir/tools' | |||||
15 | ./make_tarball.py |
|
15 | ./make_tarball.py | |
16 | mv ipython-*.tgz $ipbackupdir |
|
16 | mv ipython-*.tgz $ipbackupdir | |
17 |
|
17 | |||
18 | # Clean up build/dist directories |
|
18 | # Build release files | |
19 | rm -rf $ipdir/build/* |
|
19 | ./testrel $ipdir | |
20 | rm -rf $ipdir/dist/* |
|
|||
21 |
|
||||
22 | # Build source and binary distros |
|
|||
23 | cd $ipdir |
|
|||
24 | ./setup.py sdist --formats=gztar |
|
|||
25 |
|
||||
26 | # Build version-specific RPMs, where we must use the --python option to ensure |
|
|||
27 | # that the resulting RPM is really built with the requested python version (so |
|
|||
28 | # things go to lib/python2.X/...) |
|
|||
29 | #python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4 |
|
|||
30 | #python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5 |
|
|||
31 |
|
||||
32 | # Build eggs |
|
|||
33 | python2.4 ./setup_bdist_egg.py |
|
|||
34 | python2.5 ./setup_bdist_egg.py |
|
|||
35 |
|
||||
36 | # Call the windows build separately, so that the extra Windows scripts don't |
|
|||
37 | # get pulled into Unix builds (setup.py has code which checks for |
|
|||
38 | # bdist_wininst) |
|
|||
39 | ./setup.py bdist_wininst --install-script=ipython_win_post_install.py |
|
|||
40 |
|
||||
41 | # Change name so retarded Vista runs the installer correctly |
|
|||
42 | rename 's/win32/win32-setup/' $ipdir/dist/*.exe |
|
|||
43 |
|
20 | |||
44 | # Register with the Python Package Index (PyPI) |
|
21 | # Register with the Python Package Index (PyPI) | |
45 | echo "Registering with PyPI..." |
|
22 | echo "Registering with PyPI..." |
@@ -1,26 +1,30 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/bash | |
2 |
|
2 | |||
3 | # release test |
|
3 | # Build the release files. Kept as a separate script so we can easily do local | |
|
4 | # dry runs without uploading anything externally. | |||
4 |
|
5 | |||
5 |
ipdir=$ |
|
6 | ipdir=${1-..} | |
6 |
|
7 | |||
7 | cd $ipdir |
|
8 | cd $ipdir | |
8 |
|
9 | |||
9 | # Clean up build/dist directories |
|
10 | # Clean up build/dist directories | |
10 |
rm -rf |
|
11 | rm -rf build/* | |
11 |
rm -rf |
|
12 | rm -rf dist/* | |
|
13 | rm -rf docs/build/* | |||
|
14 | rm -rf docs/dist/* | |||
12 |
|
15 | |||
13 |
# |
|
16 | # Build source and binary distros | |
14 | cd $ipdir |
|
|||
15 | ./setup.py sdist --formats=gztar |
|
17 | ./setup.py sdist --formats=gztar | |
16 |
|
18 | |||
17 | # Build rpms |
|
19 | # Build version-specific RPMs, where we must use the --python option to ensure | |
18 | python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4 |
|
20 | # that the resulting RPM is really built with the requested python version (so | |
|
21 | # things go to lib/python2.X/...) | |||
19 | python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5 |
|
22 | python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5 | |
|
23 | python2.6 ./setup.py bdist_rpm --binary-only --release=py26 --python=/usr/bin/python2.6 | |||
20 |
|
24 | |||
21 | # Build eggs |
|
25 | # Build eggs | |
22 | python2.4 ./setup_bdist_egg.py |
|
|||
23 | python2.5 ./setup_bdist_egg.py |
|
26 | python2.5 ./setup_bdist_egg.py | |
|
27 | python2.6 ./setup_bdist_egg.py | |||
24 |
|
28 | |||
25 | # Call the windows build separately, so that the extra Windows scripts don't |
|
29 | # Call the windows build separately, so that the extra Windows scripts don't | |
26 | # get pulled into Unix builds (setup.py has code which checks for |
|
30 | # get pulled into Unix builds (setup.py has code which checks for | |
@@ -28,4 +32,4 b' python2.5 ./setup_bdist_egg.py' | |||||
28 | ./setup.py bdist_wininst --install-script=ipython_win_post_install.py |
|
32 | ./setup.py bdist_wininst --install-script=ipython_win_post_install.py | |
29 |
|
33 | |||
30 | # Change name so retarded Vista runs the installer correctly |
|
34 | # Change name so retarded Vista runs the installer correctly | |
31 |
rename 's/win32/win32-setup/' |
|
35 | rename 's/win32/win32-setup/' dist/*.exe |
General Comments 0
You need to be logged in to leave comments.
Login now