##// END OF EJS Templates
Fixing minor bugs in tests.
Brian Granger -
r1559:2353c578 merge
parent child Browse files
Show More
@@ -16,28 +16,12 b' __docformat__ = "restructuredtext en"'
16 #-------------------------------------------------------------------------------
16 #-------------------------------------------------------------------------------
17 import uuid
17 import uuid
18
18
19 try:
20 from zope.interface import Interface, Attribute, implements, classProvides
21 except ImportError, e:
22 e.message = """%s
23 ________________________________________________________________________________
24 zope.interface is required to run asynchronous frontends.""" % e.message
25 e.args = (e.message, ) + e.args[1:]
26
27 from frontendbase import FrontEndBase, IFrontEnd, IFrontEndFactory
28
19
20 from zope.interface import Interface, Attribute, implements, classProvides
21 from twisted.python.failure import Failure
22 from IPython.frontend.frontendbase import FrontEndBase, IFrontEnd, IFrontEndFactory
29 from IPython.kernel.core.history import FrontEndHistory
23 from IPython.kernel.core.history import FrontEndHistory
30
24 from IPython.kernel.engineservice import IEngineCore
31 try:
32 from IPython.kernel.engineservice import IEngineCore
33 from twisted.python.failure import Failure
34 except ImportError, e:
35 e.message = """%s
36 ________________________________________________________________________________
37 twisted is required to run asynchronous frontends.""" % e.message
38 e.args = (e.message, ) + e.args[1:]
39
40
41
25
42
26
43 class AsyncFrontEndBase(FrontEndBase):
27 class AsyncFrontEndBase(FrontEndBase):
@@ -24,8 +24,12 b' import string'
24 import uuid
24 import uuid
25 import _ast
25 import _ast
26
26
27 from zopeinterface import Interface, Attribute, implements, classProvides
27 from IPython.frontend.zopeinterface import (
28
28 Interface,
29 Attribute,
30 implements,
31 classProvides
32 )
29 from IPython.kernel.core.history import FrontEndHistory
33 from IPython.kernel.core.history import FrontEndHistory
30 from IPython.kernel.core.util import Bunch
34 from IPython.kernel.core.util import Bunch
31
35
@@ -358,24 +358,14 b' Installation scenarios'
358 ----------------------
358 ----------------------
359
359
360 1. Install from tarball using `python setup.py install`.
360 1. Install from tarball using `python setup.py install`.
361 a. With only readline+nose dependencies installed (test1)
361 a. With only readline+nose dependencies installed.
362
363 virtualenv --no-site-packages test1
364 # Activate it
365 easy_install nose
366 easy_install readline # On OS X or pyreadline on win32
367 cd ipython-0.9.beta3
368 python setup.py install
369
370 b. With all dependencies installed (readline, zope.interface,
362 b. With all dependencies installed (readline, zope.interface,
371 Twisted, foolscap, Sphinx, nose, pyOpenSSL) (test2)
363 Twisted, foolscap, Sphinx, nose, pyOpenSSL).
372 2. Install using easy_install.
364 2. Install using easy_install.
373 a. With only readline+nose dependencies installed (test3)
365 a. With only readline+nose dependencies installed.
374 i. Default dependencies.
366 i. Default dependencies: `easy_install ipython-0.9.beta3-py2.5.egg`
375 ii. Optional dependency sets (kernel, doc, test, security)
367 ii. Optional dependency sets: `easy_install -f ipython-0.9.beta3-py2.5.egg IPython[kernel,doc,test,security]`
376 easy_install -f ipython-0.9.beta3-py2.5.egg IPython[kernel,doc,test,security]
368 b. With all dependencies already installed.
377
378 b. With all dependencies already installed (test2)
379
369
380
370
381 Tests to run for these scenarios
371 Tests to run for these scenarios
General Comments 0
You need to be logged in to leave comments. Login now