##// END OF EJS Templates
Merge updates for 0.9.rc1 release.
Fernando Perez -
r1597:43a326b1 merge
parent child Browse files
Show More
@@ -23,9 +23,9 b" name = 'ipython'"
23 # bdist_deb does not accept underscores (a Debian convention).
23 # bdist_deb does not accept underscores (a Debian convention).
24
24
25 development = False # change this to False to do a release
25 development = False # change this to False to do a release
26 version_base = '0.9.beta3'
26 version_base = '0.9.rc1'
27 branch = 'ipython'
27 branch = 'ipython'
28 revision = '1106'
28 revision = '1124'
29
29
30 if development:
30 if development:
31 if branch == 'ipython':
31 if branch == 'ipython':
@@ -28,17 +28,16 b' help:'
28 @echo "dist all, and then puts the results in dist/"
28 @echo "dist all, and then puts the results in dist/"
29
29
30 clean:
30 clean:
31 -rm -rf build/*
31 -rm -rf build/* dist/*
32
32
33 pdf: latex
33 pdf: latex
34 cd build/latex && make all-pdf
34 cd build/latex && make all-pdf
35
35
36 all: html pdf
36 all: html pdf
37
37
38 dist: all
38 dist: clean all
39 mkdir -p dist
39 mkdir -p dist
40 -rm -rf dist/*
40 ln build/latex/ipython.pdf dist/
41 ln build/latex/IPython.pdf dist/
42 cp -al build/html dist/
41 cp -al build/html dist/
43 @echo "Build finished. Final docs are in dist/"
42 @echo "Build finished. Final docs are in dist/"
44
43
@@ -27,6 +27,11 b' Release 0.9'
27 New features
27 New features
28 ------------
28 ------------
29
29
30 * Laurent's WX application has been given a top-level script called ipython-wx,
31 and it has received numerous fixes. We expect this code to be
32 architecturally better integrated with Gael's WX 'ipython widget' over the
33 next few releases.
34
30 * The Editor synchronization work by Vivian De Smedt has been merged in. This
35 * The Editor synchronization work by Vivian De Smedt has been merged in. This
31 code adds a number of new editor hooks to synchronize with editors under
36 code adds a number of new editor hooks to synchronize with editors under
32 Windows.
37 Windows.
@@ -150,11 +150,11 b" latex_font_size = '11pt'"
150 # Grouping the document tree into LaTeX files. List of tuples
150 # Grouping the document tree into LaTeX files. List of tuples
151 # (source start file, target name, title, author, document class [howto/manual]).
151 # (source start file, target name, title, author, document class [howto/manual]).
152
152
153 latex_documents = [ ('index', 'IPython.tex', 'IPython Documentation',
153 latex_documents = [ ('index', 'ipython.tex', 'IPython Documentation',
154 ur"""Brian Granger, Fernando PΓ©rez and Ville Vainio\\
154 ur"""Brian Granger, Fernando PΓ©rez and Ville Vainio\\
155 \ \\
155 \ \\
156 With contributions from:\\
156 With contributions from:\\
157 Benjamin Ragan-Kelley.""",
157 Benjamin Ragan-Kelley and Barry Wark.""",
158 'manual'),
158 'manual'),
159 ]
159 ]
160
160
@@ -88,28 +88,39 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
88 "cd docs/man && gzip -9c pycolor.1 > pycolor.1.gz"),
88 "cd docs/man && gzip -9c pycolor.1 > pycolor.1.gz"),
89 ]
89 ]
90
90
91 # Only build the docs is sphinx is present
91 # Only build the docs if sphinx is present
92 try:
92 try:
93 import sphinx
93 import sphinx
94 except ImportError:
94 except ImportError:
95 pass
95 pass
96 else:
96 else:
97 pass
97 # The Makefile calls the do_sphinx scripts to build html and pdf, so
98 # BEG: This is disabled as I am not sure what to depend on.
98 # just one target is enough to cover all manual generation
99 # I actually don't think we should be automatically building
99
100 # the docs for people.
100 # First, compute all the dependencies that can force us to rebuild the
101 # The do_sphinx scripts builds html and pdf, so just one
101 # docs. Start with the main release file that contains metadata
102 # target is enough to cover all manual generation
102 docdeps = ['IPython/Release.py']
103 # to_update.append(
103 # Inculde all the reST sources
104 # ('docs/manual/ipython.pdf',
104 pjoin = os.path.join
105 # ['IPython/Release.py','docs/source/ipython.rst'],
105 for dirpath,dirnames,filenames in os.walk('docs/source'):
106 # "cd docs && python do_sphinx.py")
106 if dirpath in ['_static','_templates']:
107 # )
107 continue
108 docdeps += [ pjoin(dirpath,f) for f in filenames
109 if f.endswith('.txt') ]
110 # and the examples
111 for dirpath,dirnames,filenames in os.walk('docs/example'):
112 docdeps += [ pjoin(dirpath,f) for f in filenames
113 if not f.endswith('~') ]
114 # then, make them all dependencies for the main PDF (the html will get
115 # auto-generated as well).
116 to_update.append(
117 ('docs/dist/ipython.pdf',
118 docdeps,
119 "cd docs && make dist")
120 )
108
121
109 [ target_update(*t) for t in to_update ]
122 [ target_update(*t) for t in to_update ]
110
123
111 # Build the docs
112 os.system('cd docs && make dist')
113
124
114 #---------------------------------------------------------------------------
125 #---------------------------------------------------------------------------
115 # Find all the packages, package data, scripts and data_files
126 # Find all the packages, package data, scripts and data_files
@@ -12,26 +12,6 b' echo "=================================="'
12
12
13 echo "Marking ChangeLog with release information and making NEWS file..."
13 echo "Marking ChangeLog with release information and making NEWS file..."
14
14
15 # Stamp changelog and save a copy of the status at each version, in case later
16 # we want the NEWS file to start from a point before the very last release (if
17 # very small interim releases have no significant changes).
18
19 cd $ipdir/doc
20 cp ChangeLog ChangeLog.old
21 cp ChangeLog ChangeLog.$version
22 daystamp=`date +%Y-%m-%d`
23 echo $daystamp " ***" Released version $version > ChangeLog
24 echo >> ChangeLog
25 cat ChangeLog.old >> ChangeLog
26 rm ChangeLog.old
27
28 # Build NEWS file
29 echo "Changes between the last two releases (major or minor)" > NEWS
30 echo "Note that this is an auto-generated diff of the ChangeLogs" >> NEWS
31 echo >> NEWS
32 diff ChangeLog.previous ChangeLog | grep -v '^0a' | sed 's/^> //g' >> NEWS
33 cp ChangeLog ChangeLog.previous
34
35 # Clean up build/dist directories
15 # Clean up build/dist directories
36 rm -rf $ipdir/build/*
16 rm -rf $ipdir/build/*
37 rm -rf $ipdir/dist/*
17 rm -rf $ipdir/dist/*
@@ -77,25 +57,4 b' echo "Uploading backup files..."'
77 cd $ipbackupdir
57 cd $ipbackupdir
78 scp `ls -1tr *tgz | tail -1` ipython@ipython.scipy.org:www/backup/
58 scp `ls -1tr *tgz | tail -1` ipython@ipython.scipy.org:www/backup/
79
59
80 echo "Updating webpage..."
81 cd $ipdir/doc
82 www=~/ipython/homepage
83 cp ChangeLog NEWS $www
84 rm -rf $www/doc/*
85 cp -r manual/ $www/doc
86 cd $www
87 ./update
88
89 # Alert package maintainers
90 #echo "Alerting package maintainers..."
91 #maintainers='fernando.perez@berkeley.edu ariciputi@users.sourceforge.net jack@xiph.org tretkowski@inittab.de dryice@hotpop.com willmaier@ml1.net'
92 # maintainers='fernando.perez@berkeley.edu'
93
94 # for email in $maintainers
95 # do
96 # echo "Emailing $email..."
97 # mail -s "[Package maintainer notice] A new IPython is out. Version: $version" \
98 # $email < NEWS
99 # done
100
101 echo "Done!"
60 echo "Done!"
General Comments 0
You need to be logged in to leave comments. Login now