##// END OF EJS Templates
Fixing installation related issues.
Brian Granger -
Show More
@@ -84,7 +84,7 b' def isolate_ipython0(func):'
84 84 ipython0.user_ns = user_ns
85 85 ipython0.user_global_ns = global_ns
86 86 # Undo the hack at creation of PrefilterFrontEnd
87 from IPythoncore. import iplib
87 from IPython.core import iplib
88 88 iplib.InteractiveShell.isthreaded = False
89 89 return out
90 90
@@ -30,7 +30,7 b' __docformat__ = "restructuredtext en"'
30 30
31 31 import sys
32 32
33 # from IPython.tools import growl
33 # from IPython.utils import growl
34 34 # growl.start("IPython1 Client")
35 35
36 36
@@ -18,7 +18,7 b' __docformat__ = "restructuredtext en"'
18 18 # Imports
19 19 #-------------------------------------------------------------------------------
20 20 from traceback_trap import TracebackTrap
21 from IPython.ultraTB import ColorTB
21 from IPython.core.ultratb import ColorTB
22 22
23 23 class SyncTracebackTrap(TracebackTrap):
24 24 """ TracebackTrap that displays immediatly the traceback in addition
@@ -35,7 +35,7 b' from twisted.internet import defer, reactor'
35 35 from twisted.python import log, components, failure
36 36 from zope.interface import Interface, implements, Attribute
37 37
38 from IPython.tools import growl
38 from IPython.utils import growl
39 39 from IPython.kernel.util import printer
40 40 from IPython.kernel.twistedutil import gatherBoth
41 41 from IPython.kernel import map as Map
@@ -30,7 +30,7 b' from zope.interface import Interface, implements, Attribute'
30 30 from IPython.kernel.twistedutil import gatherBoth
31 31 from IPython.kernel import error
32 32 from IPython.external import guid
33 from IPython.tools import growl
33 from IPython.utils import growl
34 34
35 35 class PendingDeferredManager(object):
36 36 """A class to track pending deferreds.
@@ -32,7 +32,7 b' from twisted.python import log'
32 32
33 33 from IPython.kernel.fcutil import Tub, UnauthenticatedTub, have_crypto
34 34
35 # from IPython.tools import growl
35 # from IPython.utils import growl
36 36 # growl.start("IPython1 Controller")
37 37
38 38 from IPython.kernel.error import SecurityError
1 NO CONTENT: file renamed from scripts/iptest to IPython/scripts/iptest
@@ -23,6 +23,6 b' this mode, there is no way to pass IPython any command-line options, as those'
23 23 are trapped first by Python itself.
24 24 """
25 25
26 import IPython.Shell
26 import IPython.core.shell
27 27
28 IPython.Shell.start().mainloop()
28 IPython.core.shell.start().mainloop()
1 NO CONTENT: file renamed from scripts/ipython-wx to IPython/scripts/ipython-wx
1 NO CONTENT: file renamed from scripts/ipython_win_post_install.py to IPython/scripts/ipython_win_post_install.py
1 NO CONTENT: file renamed from scripts/ipythonx to IPython/scripts/ipythonx
@@ -4,6 +4,6 b''
4 4
5 5 Run with --help for details, or see the irunner source."""
6 6
7 from IPython import irunner
7 from IPython.lib import irunner
8 8
9 9 irunner.main()
@@ -2,5 +2,5 b''
2 2 # -*- coding: utf-8 -*-
3 3 """Simple wrapper around PyColorize, which colorizes python sources."""
4 4
5 import IPython.PyColorize
6 IPython.PyColorize.main()
5 import IPython.utils.PyColorize
6 IPython.utils.PyColorize.main()
@@ -2,16 +2,20 b' include ipython.py'
2 2 include setupbase.py
3 3 include setupegg.py
4 4
5 graft scripts
6
7 5 graft setupext
8 6
9 graft IPython/UserConfig
10
11 7 graft IPython/kernel
12 8 graft IPython/config
9 graft IPython/core
10 graft IPython/deathrow
11 graft IPython/external
12 graft IPython/frontend
13 graft IPython/gui
14 graft IPython/lib
15 graft IPython/quarantine
16 graft IPython/scripts
13 17 graft IPython/testing
14 graft IPython/tools
18 graft IPython/utils
15 19
16 20 recursive-include IPython/Extensions igrid_help*
17 21
@@ -28,7 +28,7 b' import ipython_console_highlighting'
28 28
29 29 # We load the ipython release info into a dict by explicit execution
30 30 iprelease = {}
31 execfile('../../IPython/Release.py',iprelease)
31 execfile('../../IPython/core/release.py',iprelease)
32 32
33 33 # General configuration
34 34 # ---------------------
@@ -84,6 +84,11 b' level modules.'
84 84
85 85 Need to update the top level IPython/__init__.py file.
86 86
87 Need to get installation working correctly.
88
89 When running python setup.py sdist, the Sphinx API docs fail to build because
90 of something going on with IPython.core.fakemodule
91
87 92 Where things will be moved
88 93 ==========================
89 94
@@ -7,5 +7,5 b" in './scripts' directory. This file is here (ipython source root directory)"
7 7 to facilitate non-root 'zero-installation' (just copy the source tree
8 8 somewhere and run ipython.py) and development. """
9 9
10 import IPython.Shell
11 IPython.Shell.start().mainloop()
10 import IPython.core.shell
11 IPython.core.shell.start().mainloop()
@@ -29,7 +29,6 b" if os.path.exists('MANIFEST'): os.remove('MANIFEST')"
29 29
30 30 from distutils.core import setup
31 31
32 # Local imports
33 32 from IPython.utils.genutils import target_update
34 33
35 34 from setupbase import (
@@ -42,6 +41,7 b' from setupbase import ('
42 41 )
43 42
44 43 isfile = os.path.isfile
44 pjoin = os.path.join
45 45
46 46 #-------------------------------------------------------------------------------
47 47 # Handle OS specific things
@@ -99,7 +99,7 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
99 99
100 100 # First, compute all the dependencies that can force us to rebuild the
101 101 # docs. Start with the main release file that contains metadata
102 docdeps = ['IPython/Release.py']
102 docdeps = ['IPython/core/release.py']
103 103 # Inculde all the reST sources
104 104 pjoin = os.path.join
105 105 for dirpath,dirnames,filenames in os.walk('docs/source'):
@@ -144,12 +144,13 b" if 'setuptools' in sys.modules:"
144 144 setuptools_extra_args['entry_points'] = {
145 145 'console_scripts': [
146 146 'ipython = IPython.core.ipapi:launch_new_instance',
147 'pycolor = IPython.PyColorize:main',
147 'pycolor = IPython.utils.PyColorize:main',
148 148 'ipcontroller = IPython.kernel.scripts.ipcontroller:main',
149 149 'ipengine = IPython.kernel.scripts.ipengine:main',
150 150 'ipcluster = IPython.kernel.scripts.ipcluster:main',
151 151 'ipythonx = IPython.frontend.wx.ipythonx:main',
152 152 'iptest = IPython.testing.iptest:main',
153 'irunner = IPython.lib.irunner:main'
153 154 ]
154 155 }
155 156 setup_args['extras_require'] = dict(
@@ -166,9 +167,9 b" if 'setuptools' in sys.modules:"
166 167 scripts = []
167 168 else:
168 169 # package_data of setuptools was introduced to distutils in 2.4
169 cfgfiles = filter(isfile, glob('IPython/UserConfig/*'))
170 cfgfiles = filter(isfile, glob(pjoin('IPython','config','userconfig')))
170 171 if sys.version_info < (2,4):
171 data_files.append(('lib', 'IPython/UserConfig', cfgfiles))
172 data_files.append(('lib', pjoin('IPython','config','userconfig'), cfgfiles))
172 173 # If we are running without setuptools, call this function which will
173 174 # check for dependencies an inform the user what is needed. This is
174 175 # just to make life easy for users.
@@ -58,7 +58,7 b' def file_doesnt_endwith(test,endings):'
58 58 #---------------------------------------------------------------------------
59 59
60 60 # Release.py contains version, authors, license, url, keywords, etc.
61 execfile(pjoin('IPython','Release.py'))
61 execfile(pjoin('IPython','core','release.py'))
62 62
63 63 # Create a dict with the basic information
64 64 # This dict is eventually passed to setup after additional keys are added.
@@ -104,21 +104,30 b' def find_packages():'
104 104 """
105 105 packages = ['IPython']
106 106 add_package(packages, 'config', tests=True)
107 add_package(packages, 'config.userconfig')
108 add_package(packages, 'core', tests=True)
109 add_package(packages, 'deathrow', tests=True)
107 110 add_package(packages , 'Extensions')
108 111 add_package(packages, 'external')
109 add_package(packages, 'gui')
110 add_package(packages, 'gui.wx')
111 112 add_package(packages, 'frontend', tests=True)
113 # Don't include the cocoa frontend for now as it is not stable
114 if sys.platform == 'darwin' and False:
115 add_package(packages, 'frontend.cocoa', tests=True, others=['plugin'])
116 add_package(packages, 'frontend.cocoa.examples')
117 add_package(packages, 'frontend.cocoa.examples.IPython1Sandbox')
118 add_package(packages, 'frontend.cocoa.examples.IPython1Sandbox.English.lproj')
112 119 add_package(packages, 'frontend.process')
113 120 add_package(packages, 'frontend.wx')
114 add_package(packages, 'frontend.cocoa', tests=True)
121 add_package(packages, 'gui')
122 add_package(packages, 'gui.wx')
115 123 add_package(packages, 'kernel', config=True, tests=True, scripts=True)
116 124 add_package(packages, 'kernel.core', config=True, tests=True)
125 add_package(packages, 'lib', tests=True)
126 add_package(packages, 'quarantine', tests=True)
127 add_package(packages, 'scripts')
117 128 add_package(packages, 'testing', tests=True)
118 add_package(packages, 'tests')
119 129 add_package(packages, 'testing.plugin', tests=False)
120 add_package(packages, 'tools', tests=True)
121 add_package(packages, 'UserConfig')
130 add_package(packages, 'utils', tests=True)
122 131 return packages
123 132
124 133 #---------------------------------------------------------------------------
@@ -132,8 +141,7 b' def find_package_data():'
132 141 # This is not enough for these things to appear in an sdist.
133 142 # We need to muck with the MANIFEST to get this to work
134 143 package_data = {
135 'IPython.UserConfig' : ['*'],
136 'IPython.tools.tests' : ['*.txt'],
144 'IPython.config.userconfig' : ['*'],
137 145 'IPython.testing' : ['*.txt']
138 146 }
139 147 return package_data
@@ -187,17 +195,24 b' def find_data_files():'
187 195 Most of these are docs.
188 196 """
189 197
190 docdirbase = 'share/doc/ipython'
191 manpagebase = 'share/man/man1'
192
198 docdirbase = pjoin('share', 'doc', 'ipython')
199 manpagebase = pjoin('share', 'man', 'man1')
200
193 201 # Simple file lists can be made by hand
194 manpages = filter(isfile, glob('docs/man/*.1.gz'))
195 igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
202 manpages = filter(isfile, glob(pjoin('docs','man','*.1.gz')))
203 igridhelpfiles = filter(isfile, glob(pjoin('IPython','Extensions','igrid_help.*')))
196 204
197 205 # For nested structures, use the utility above
198 example_files = make_dir_struct('data','docs/examples',
199 pjoin(docdirbase,'examples'))
200 manual_files = make_dir_struct('data','docs/dist',pjoin(docdirbase,'manual'))
206 example_files = make_dir_struct(
207 'data',
208 pjoin('docs','examples'),
209 pjoin(docdirbase,'examples')
210 )
211 manual_files = make_dir_struct(
212 'data',
213 pjoin('docs','dist'),
214 pjoin(docdirbase,'manual')
215 )
201 216
202 217 # And assemble the entire output list
203 218 data_files = [ ('data',manpagebase, manpages),
@@ -220,16 +235,18 b' def find_scripts():'
220 235 """
221 236 Find IPython's scripts.
222 237 """
223 scripts = ['IPython/kernel/scripts/ipengine',
224 'IPython/kernel/scripts/ipcontroller',
225 'IPython/kernel/scripts/ipcluster',
226 'scripts/ipython',
227 'scripts/ipythonx',
228 'scripts/ipython-wx',
229 'scripts/pycolor',
230 'scripts/irunner',
231 'scripts/iptest',
232 ]
238 kernel_scripts = pjoin('IPython','kernel','scripts')
239 main_scripts = pjoin('IPython','scripts')
240 scripts = [pjoin(kernel_scripts, 'ipengine'),
241 pjoin(kernel_scripts, 'ipcontroller'),
242 pjoin(kernel_scripts, 'ipcluster'),
243 pjoin(main_scripts, 'ipython'),
244 pjoin(main_scripts, 'ipythonx'),
245 pjoin(main_scripts, 'ipython-wx'),
246 pjoin(main_scripts, 'pycolor'),
247 pjoin(main_scripts, 'irunner'),
248 pjoin(main_scripts, 'iptest')
249 ]
233 250
234 251 # Script to be run by the windows binary installer after the default setup
235 252 # routine, to add shortcuts and similar windows-only things. Windows
@@ -239,7 +256,7 b' def find_scripts():'
239 256 if len(sys.argv) > 2 and ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
240 257 print >> sys.stderr,"ERROR: bdist_wininst must be run alone. Exiting."
241 258 sys.exit(1)
242 scripts.append('scripts/ipython_win_post_install.py')
259 scripts.append(pjoin(main_scripts,'ipython_win_post_install.py'))
243 260
244 261 return scripts
245 262
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now