##// END OF EJS Templates
merge all from 0.7.3 branch to trunk
vivainio -
Show More
1 NO CONTENT: modified file
NO CONTENT: modified file
1 NO CONTENT: modified file
NO CONTENT: modified file
@@ -21,7 +21,7 b' README_Windows.txt'
21 """
21 """
22
22
23 from subprocess import Popen,PIPE
23 from subprocess import Popen,PIPE
24 import os
24 import os,shlex
25
25
26 from IPython import genutils
26 from IPython import genutils
27
27
@@ -38,7 +38,7 b' class IpyPopen(Popen):'
38 os.system('taskkill /PID %d' % self.pid)
38 os.system('taskkill /PID %d' % self.pid)
39
39
40 def startjob(job):
40 def startjob(job):
41 p = IpyPopen(job, stdout=PIPE, shell = False)
41 p = IpyPopen(shlex.split(job), stdout=PIPE, shell = False)
42 p.line = job
42 p.line = job
43 return p
43 return p
44
44
1 NO CONTENT: modified file
NO CONTENT: modified file
@@ -1,7 +1,7 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Release data for the IPython project.
2 """Release data for the IPython project.
3
3
4 $Id: Release.py 1976 2006-12-08 11:53:57Z vivainio $"""
4 $Id: Release.py 2010 2006-12-20 15:29:17Z vivainio $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
@@ -22,12 +22,11 b" name = 'ipython'"
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
23 # bdist_deb does not accept underscores (a Debian convention).
23 # bdist_deb does not accept underscores (a Debian convention).
24
24
25 revision = '1975'
25 revision = '2007'
26
26
27 #version = '0.7.3.svn'
27 version = '0.7.3'
28
29 version = '0.7.3b3.r' + revision.rstrip('M')
30
28
29 #version = '0.7.3rc2.r' + revision.rstrip('M')
31
30
32 description = "An enhanced interactive Python shell."
31 description = "An enhanced interactive Python shell."
33
32
1 NO CONTENT: modified file
NO CONTENT: modified file
1 NO CONTENT: modified file
NO CONTENT: modified file
1 NO CONTENT: modified file
NO CONTENT: modified file
@@ -6,7 +6,7 b''
6 # the file COPYING, distributed as part of this software.
6 # the file COPYING, distributed as part of this software.
7 #*****************************************************************************
7 #*****************************************************************************
8
8
9 # $Id: usage.py 1332 2006-05-30 01:41:28Z fperez $
9 # $Id: usage.py 2010 2006-12-20 15:29:17Z vivainio $
10
10
11 from IPython import Release
11 from IPython import Release
12 __author__ = '%s <%s>' % Release.authors['Fernando']
12 __author__ = '%s <%s>' % Release.authors['Fernando']
@@ -623,7 +623,8 b" cd /usr/share : Obvious, also 'cd d:\\home\\_ipython' works"
623 History:
623 History:
624
624
625 _i, _ii, _iii : Previous, next previous, next next previous input
625 _i, _ii, _iii : Previous, next previous, next next previous input
626 _ih[4], _ih[2:5] : Input history line 4, lines 2-4
626 _i4, _ih[2:5] : Input history line 4, lines 2-4
627 exec _i81 : Execute input history line #81 again
627 _, __, ___ : previous, next previous, next next previous output
628 _, __, ___ : previous, next previous, next next previous output
628 _dh : Directory history
629 _dh : Directory history
629 _oh : Output history
630 _oh : Output history
@@ -1,3 +1,32 b''
1 2006-12-20 Ville Vainio <vivainio@gmail.com>
2
3 * 0.7.3 is out - merge all from 0.7.3 branch to trunk
4
5 2006-12-17 Ville Vainio <vivainio@gmail.com>
6
7 * Extensions/jobctrl.py: Fixed &cmd arg arg...
8 to work properly on posix too
9
10 * Release.py: Update revnum (version is still just 0.7.3).
11
12 2006-12-15 Ville Vainio <vivainio@gmail.com>
13
14 * scripts/ipython_win_post_install: create ipython.py in
15 prefix + "/scripts".
16
17 * Release.py: Update version to 0.7.3.
18
19 2006-12-14 Ville Vainio <vivainio@gmail.com>
20
21 * scripts/ipython_win_post_install: Overwrite old shortcuts
22 if they already exist
23
24 * Release.py: release 0.7.3rc2
25
26 2006-12-13 Ville Vainio <vivainio@gmail.com>
27
28 * Branch and update Release.py for 0.7.3rc1
29
1 2006-12-13 Fernando Perez <Fernando.Perez@colorado.edu>
30 2006-12-13 Fernando Perez <Fernando.Perez@colorado.edu>
2
31
3 * IPython/Shell.py (IPShellWX): update for current WX naming
32 * IPython/Shell.py (IPShellWX): update for current WX naming
1 NO CONTENT: modified file
NO CONTENT: modified file
@@ -1,12 +1,11 b''
1 #!python
1 #!python
2 """Windows-specific part of the installation"""
2 """Windows-specific part of the installation"""
3
3
4 import os, sys
4 import os, sys, shutil
5
5
6 def create_shortcut_safe(target,description,link_file,*args,**kw):
6 def mkshortcut(target,description,link_file,*args,**kw):
7 """make a shortcut if it doesn't exist, and register its creation"""
7 """make a shortcut if it doesn't exist, and register its creation"""
8
8
9 if not os.path.isfile(link_file):
10 create_shortcut(target, description, link_file,*args,**kw)
9 create_shortcut(target, description, link_file,*args,**kw)
11 file_created(link_file)
10 file_created(link_file)
12
11
@@ -49,20 +48,23 b' def install():'
49 # Create program shortcuts ...
48 # Create program shortcuts ...
50 f = ip_dir + r'\IPython.lnk'
49 f = ip_dir + r'\IPython.lnk'
51 a = prefix + r'\scripts\ipython'
50 a = prefix + r'\scripts\ipython'
52 create_shortcut_safe(python,'IPython',f,a)
51 mkshortcut(python,'IPython',f,a)
53
52
54 f = ip_dir + r'\pysh.lnk'
53 f = ip_dir + r'\pysh.lnk'
55 a = prefix + r'\scripts\ipython -p pysh'
54 a = prefix + r'\scripts\ipython -p sh'
56 create_shortcut_safe(python,'pysh',f,a)
55 mkshortcut(python,'IPython command prompt mode',f,a)
57
56
58 # Create documentation shortcuts ...
57 # Create documentation shortcuts ...
59 t = prefix + r'\share\doc\ipython-%s\manual.pdf' % version
58 t = prefix + r'\share\doc\ipython-%s\manual.pdf' % version
60 f = ip_dir + r'\Manual in PDF.lnk'
59 f = ip_dir + r'\Manual in PDF.lnk'
61 create_shortcut_safe(t,r'IPython Manual - PDF-Format',f)
60 mkshortcut(t,r'IPython Manual - PDF-Format',f)
62
61
63 t = prefix + r'\share\doc\ipython-%s\manual\manual.html' % version
62 t = prefix + r'\share\doc\ipython-%s\manual\manual.html' % version
64 f = ip_dir + r'\Manual in HTML.lnk'
63 f = ip_dir + r'\Manual in HTML.lnk'
65 create_shortcut_safe(t,'IPython Manual - HTML-Format',f)
64 mkshortcut(t,'IPython Manual - HTML-Format',f)
65
66 # make ipython.py
67 shutil.copy(prefix + r'\scripts\ipython', prefix + r'\scripts\ipython.py')
66
68
67 def remove():
69 def remove():
68 """Routine to be run by the win32 installer with the -remove switch."""
70 """Routine to be run by the win32 installer with the -remove switch."""
1 NO CONTENT: modified file
NO CONTENT: modified file
1 NO CONTENT: modified file
NO CONTENT: modified file
@@ -1,6 +1,6 b''
1 import os,sys,shutil
1 import os,sys,shutil
2
2
3 repo = "http://ipython.scipy.org/svn/ipython/ipython/trunk"
3 repo = "http://ipython.scipy.org/svn/ipython/ipython/branches/0.7.3"
4 basename = 'ipython'
4 basename = 'ipython'
5 workdir = './mkdist'
5 workdir = './mkdist'
6
6
1 NO CONTENT: modified file
NO CONTENT: modified file
General Comments 0
You need to be logged in to leave comments. Login now