Merge with upstream.

IPython/testing/plugin/simple.py

@@ -0,0 +1,33 b''
+"""Simple example using doctests.
+
+This file just contains doctests both using plain python and IPython prompts.
+All tests should be loaded by nose.
+"""
+
+def pyfunc():
+    """Some pure python tests...
+
+    >>> pyfunc()
+    'pyfunc'
+
+    >>> import os
+
+    >>> 2+3
+    5
+
+    >>> for i in range(3):
+    ...     print i,
+    ...     print i+1,
+    ...
+    0 1 1 2 2 3
+    """
+    return 'pyfunc'
+
+
+def ipyfunc2():
+    """Some pure python tests...
+
+    >>> 1+1
+    2
+    """
+    return 'pyfunc2'

IPython/Extensions/ipy_completers.py

@@ -318,6 +318,9 b' def cd_completer(self, event):'
             return ents
         return []
 
+    if event.symbol.startswith('--'):
+        return ["--" + os.path.basename(d) for d in ip.user_ns['_dh']]
+    
     if relpath.startswith('~'):
         relpath = os.path.expanduser(relpath).replace('\\','/')
     found = []

IPython/Extensions/ipy_leo.py

@@ -12,6 +12,8 b' from IPython.ipapi import TryNext'
 import IPython.macro
 import IPython.Shell
 
+_leo_push_history = set()
+
 def init_ipython(ipy):
     """ This will be run by _ip.load('ipy_leo') 
     
@@ -25,17 +27,21 b' def init_ipython(ipy):'
     ip.expose_magic('mb',mb_f)
     ip.expose_magic('lee',lee_f)
     ip.expose_magic('leoref',leoref_f)
+    ip.expose_magic('lleo',lleo_f)    
+    # Note that no other push command should EVER have lower than 0
+    expose_ileo_push(push_mark_req, -1)
     expose_ileo_push(push_cl_node,100)
     # this should be the LAST one that will be executed, and it will never raise TryNext
     expose_ileo_push(push_ipython_script, 1000)
     expose_ileo_push(push_plain_python, 100)
     expose_ileo_push(push_ev_node, 100)
+    ip.set_hook('pre_prompt_hook', ileo_pre_prompt_hook)     
     global wb
     wb = LeoWorkbook()
     ip.user_ns['wb'] = wb 
     
-    show_welcome()
 
+first_launch = True
 
 def update_commander(new_leox):
     """ Set the Leo commander to use
@@ -45,7 +51,12 b' def update_commander(new_leox):'
     ipython-launch to tell ILeo what document the commands apply to.
     
     """
-    
+
+    global first_launch
+    if first_launch:
+        show_welcome()
+        first_launch = False
+
     global c,g
     c,g = new_leox.c, new_leox.g
     print "Set Leo Commander:",c.frame.getTitle()
@@ -70,9 +81,10 b' def format_for_leo(obj):'
     """ Convert obj to string representiation (for editing in Leo)"""
     return pprint.pformat(obj)
 
-@format_for_leo.when_type(list)
-def format_list(obj):
-    return "\n".join(str(s) for s in obj)
+# Just an example - note that this is a bad to actually do!
+#@format_for_leo.when_type(list)
+#def format_list(obj):
+#    return "\n".join(str(s) for s in obj)
   
 
 attribute_re = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*$')
@@ -175,6 +187,7 b' class LeoNode(object, UserDict.DictMixin):'
     def __get_h(self): return self.p.headString()
     def __set_h(self,val):
         c.setHeadString(self.p,val)
+        LeoNode.last_edited = self
         c.redraw()
         
     h = property( __get_h, __set_h, doc = "Node headline string")  
@@ -182,6 +195,7 b' class LeoNode(object, UserDict.DictMixin):'
     def __get_b(self): return self.p.bodyString()
     def __set_b(self,val):
         c.setBodyString(self.p, val)
+        LeoNode.last_edited = self
         c.redraw()
     
     b = property(__get_b, __set_b, doc = "Nody body string")
@@ -251,6 +265,14 b' class LeoNode(object, UserDict.DictMixin):'
         p = c.createLastChildNode(self.p, head, '')
         LeoNode(p).v = val
         
+    def __delitem__(self, key):
+        """ Remove child
+        
+        Allows stuff like wb.foo.clear() to remove all children
+        """
+        self[key].p.doDelete()
+        c.redraw()
+    
     def ipush(self):
         """ Does push-to-ipython on the node """
         push_from_leo(self)
@@ -260,6 +282,12 b' class LeoNode(object, UserDict.DictMixin):'
         c.setCurrentPosition(self.p)
         c.redraw()
         
+    def append(self):
+        """ Add new node as the last child, return the new node """
+        p = self.p.insertAsLastChild()
+        return LeoNode(p)
+        
+        
     def script(self):
         """ Method to get the 'tangled' contents of the node
         
@@ -319,6 +347,19 b' class LeoWorkbook:'
             if re.match(cmp, node.h, re.IGNORECASE):
                 yield node
         return
+    
+    def require(self, req):
+        """ Used to control node push dependencies 
+        
+        Call this as first statement in nodes. If node has not been pushed, it will be pushed before proceeding
+        
+        E.g. wb.require('foo') will do wb.foo.ipush() if it hasn't been done already
+        """
+        
+        if req not in _leo_push_history:
+            es('Require: ' + req)
+            getattr(self,req).ipush()
+     
 
 @IPython.generics.complete_object.when_type(LeoWorkbook)
 def workbook_complete(obj, prev):
@@ -361,9 +402,13 b' def push_ipython_script(node):'
         hstart = len(ip.IP.input_hist)
         script = node.script()
                 
+        # The current node _p needs to handle wb.require() and recursive ipushes
+        old_p = ip.user_ns.get('_p',None)
         ip.user_ns['_p'] = node
         ip.runlines(script)
-        ip.user_ns.pop('_p',None)
+        ip.user_ns['_p'] = old_p
+        if old_p is None:
+            del ip.user_ns['_p']
         
         has_output = False
         for idx in range(hstart,len(ip.IP.input_hist)):
@@ -428,6 +473,14 b' def push_ev_node(node):'
     res = ip.ev(expr)
     node.v = res
     
+def push_mark_req(node):
+    """ This should be the first one that gets called.
+    
+    It will mark the node as 'pushed', for wb.require.
+    """
+    _leo_push_history.add(node.h)
+    raise TryNext
+    
     
 def push_position_from_leo(p):
     try:
@@ -521,13 +574,12 b' def lee_f(self,s):'
     finally:
         c.redraw()
 
-
-
 def leoref_f(self,s):
     """ Quick reference for ILeo """
     import textwrap
     print textwrap.dedent("""\
-    %leoe file/object - open file / object in leo
+    %lee file/object - open file / object in leo
+    %lleo Launch leo (use if you started ipython first!)
     wb.foo.v  - eval node foo (i.e. headstring is 'foo' or '@ipy foo')
     wb.foo.v = 12 - assign to body of node foo
     wb.foo.b - read or write the body of node foo
@@ -560,6 +612,16 b' def mb_completer(self,event):'
     cmds.sort()
     return cmds
 
+def ileo_pre_prompt_hook(self):
+    # this will fail if leo is not running yet
+    try:
+        c.outerUpdate()
+    except NameError:
+        pass
+    raise TryNext
+    
+
+
 def show_welcome():
     print "------------------"
     print "Welcome to Leo-enabled IPython session!"
@@ -574,5 +636,25 b' def run_leo_startup_node():'
         print "Running @ipy-startup nodes"
         for n in LeoNode(p):
             push_from_leo(n)
-            
 
+def lleo_f(selg,  args):
+    """ Launch leo from within IPython
+
+    This command will return immediately when Leo has been
+    launched, leaving a Leo session that is connected 
+    with current IPython session (once you press alt+I in leo)
+
+    Usage::
+      lleo foo.leo
+      lleo 
+    """
+    
+    import shlex, sys
+    argv = ['leo'] + shlex.split(args)
+    sys.argv = argv
+    # if this var exists and is true, leo will "launch" (connect)
+    # ipython immediately when it's started
+    global _request_immediate_connect
+    _request_immediate_connect = True
+    import leo.core.runLeo
+    leo.core.runLeo.run()

IPython/Logger.py

@@ -193,7 +193,7 b' which already exists. But you must first start the logging process with'
         try:
             input_hist = self.shell.user_ns['_ih']
         except:
-            print 'userns:',self.shell.user_ns.keys()
+            #print 'userns:',self.shell.user_ns.keys()  # dbg
             return
         
         out_cache = self.shell.outputcache

IPython/Magic.py

@@ -2693,6 +2693,8 b' Defaulting color scheme to \'NoColor\'"""'
 
           cd -<n>: changes to the n-th directory in the directory history.
 
+          cd --foo: change to directory that matches 'foo' in history
+            
           cd -b <bookmark_name>: jump to a bookmark set by %bookmark
              (note: cd <bookmark_name> is enough if there is no
               directory <bookmark_name>, but a bookmark with the name exists.)
@@ -2722,6 +2724,31 b' Defaulting color scheme to \'NoColor\'"""'
                 return
             else:
                 opts = {}
+        elif parameter_s.startswith('--'):
+            ps = None
+            fallback = None
+            pat = parameter_s[2:]
+            dh = self.shell.user_ns['_dh']
+            # first search only by basename (last component)
+            for ent in reversed(dh):
+                if pat in os.path.basename(ent) and os.path.isdir(ent):
+                    ps = ent
+                    break
+            
+                if fallback is None and pat in ent and os.path.isdir(ent):
+                    fallback = ent
+                
+            # if we have no last part match, pick the first full path match
+            if ps is None:
+                ps = fallback
+            
+            if ps is None:
+                print "No matching entry in directory history"
+                return
+            else:
+                opts = {}
+                
+            
         else:
             #turn all non-space-escaping backslashes to slashes, 
             # for c:\windows\directory\names\

IPython/Release.py

@@ -22,10 +22,10 b" name = 'ipython'"
 # because bdist_rpm does not accept dashes (an RPM) convention, and
 # bdist_deb does not accept underscores (a Debian convention).
 
-development = True    # change this to False to do a release
-version_base = '0.9.0'
+development = False    # change this to False to do a release
+version_base = '0.9.beta'
 branch = 'ipython'
-revision = '1016'
+revision = '1099'
 
 if development:
     if branch == 'ipython':

IPython/iplib.py

@@ -1009,7 +1009,7 b' class InteractiveShell(object,Magic):'
         hello
 
         In [10]: _ip.IP.complete('x.l')
-        Out[10]: ['x.ljust', 'x.lower', 'x.lstrip'] # random
+        Out[10]: ['x.ljust', 'x.lower', 'x.lstrip']
         """
         
         complete = self.Completer.complete

IPython/kernel/tests/engineservicetest.py

@@ -128,8 +128,9 b' class IEngineCoreTestCase(object):'
         return d
     
     @parametric
-    def testExecuteFailures(cls):
-        return [(cls.runTestExecuteFailures, cmd, exc) for cmd, exc in invalidCommands]
+    def testExecuteFailuresEngineService(cls):
+        return [(cls.runTestExecuteFailures, cmd, exc)
+                for cmd, exc in invalidCommands]
     
     def runTestPushPull(self, o):
         d = self.engine.push(dict(a=o))

IPython/kernel/tests/multienginetest.py

@@ -187,7 +187,7 b' class IMultiEngineTestCase(IMultiEngineBaseTestCase):'
         return d
 
     @parametric
-    def testExecuteFailures(cls):
+    def testExecuteFailuresMultiEng(cls):
         return [(cls.runExecuteFailures,cmd,exc) for
                 cmd,exc in invalidCommands]
 

IPython/testing/plugin/Makefile

@@ -3,49 +3,70 b' PREFIX=~/usr/local'
 PREFIX=~/tmp/local
 
 NOSE0=nosetests -vs --with-doctest --doctest-tests --detailed-errors
-NOSE=nosetests -vvs --with-ipdoctest --doctest-tests --doctest-extension=txt --detailed-errors
-
-#--with-color 
+NOSE=nosetests -vvs --with-ipdoctest --doctest-tests --doctest-extension=txt \
+--detailed-errors
 
 SRC=ipdoctest.py setup.py ../decorators.py
 
+# Default target for clean 'make'
+default: iplib
+
+# The actual plugin installation
 plugin: IPython_doctest_plugin.egg-info
 
+# Simple targets that test one thing
+simple: plugin simple.py
+	$(NOSE) simple.py
+
 dtest: plugin dtexample.py
 	$(NOSE) dtexample.py
 
-# Note: this test is double counting!!!
-rtest: plugin dtexample.py
+rtest: plugin test_refs.py
 	$(NOSE) test_refs.py
 
-std: plugin
-	nosetests -vs --with-doctest --doctest-tests IPython.strdispatch
-	$(NOSE) IPython.strdispatch
-
 test: plugin dtexample.py
 	$(NOSE) dtexample.py test*.py test*.txt
 
 deb: plugin dtexample.py
 	$(NOSE) test_combo.txt
 
-iptest: plugin
-	$(NOSE) IPython
-
+# IPython tests
 deco:
 	$(NOSE0) IPython.testing.decorators
 
-mtest: plugin
-	$(NOSE) -x IPython.Magic
+magic: plugin
+	$(NOSE) IPython.Magic
 
 ipipe: plugin
-	$(NOSE) -x IPython.Extensions.ipipe
+	$(NOSE) IPython.Extensions.ipipe
+
+iplib: plugin
+	$(NOSE)  IPython.iplib
+
+strd: plugin
+	$(NOSE) IPython.strdispatch
+
+engine: plugin
+	$(NOSE) IPython.kernel
+
+tf: plugin
+	$(NOSE) IPython.config.traitlets
+
+# All of ipython itself
+ipython: plugin
+	$(NOSE) IPython
+
+
+# Combined targets
+sr: rtest strd
 
-sr: rtest std
+base: dtest rtest test strd deco
 
-base: dtest rtest test std deco
+quick: base iplib ipipe
 
-all: base iptest
+all: base ipython
 
+# Main plugin and cleanup
 IPython_doctest_plugin.egg-info: $(SRC)
 	python setup.py install --prefix=$(PREFIX)
 	touch $@

IPython/testing/plugin/dtexample.py

@@ -58,6 +58,12 b' def ipfunc():'
     numbered history of _NN outputs, since those won't exist under the
     doctest environment:
 
+    In [7]: 'hi'
+    Out[7]: 'hi'
+
+    In [8]: print repr(_)
+    'hi'
+    
     In [7]: 3+4
     Out[7]: 7
 

IPython/testing/plugin/ipdoctest.py

@@ -13,21 +13,6 b' Limitations:'
   '_34==True', for example).  For IPython tests run via an external process the
   prompt numbers may be different, and IPython tests run as normal python code
   won't even have these special _NN variables set at all.
-
-- IPython functions that produce output as a side-effect of calling a system
-  process (e.g. 'ls') can be doc-tested, but they must be handled in an
-  external IPython process.  Such doctests must be tagged with:
-
-        # ipdoctest: EXTERNAL
-
-  so that the testing machinery handles them differently.  Since these are run
-  via pexpect in an external process, they can't deal with exceptions or other
-  fancy featurs of regular doctests.  You must limit such tests to simple
-  matching of the output.  For this reason, I recommend you limit these kinds
-  of doctests to features that truly require a separate process, and use the
-  normal IPython ones (which have all the features of normal doctests) for
-  everything else.  See the examples at the bottom of this file for a
-  comparison of what can be done with both types.
 """
 
 
@@ -63,9 +48,6 b' import nose.core'
 from nose.plugins import doctests, Plugin
 from nose.util import anyp, getpackage, test_address, resolve_name, tolist
 
-# Our own imports
-#from extdoctest import ExtensionDoctest, DocTestFinder
-#from dttools import DocTestFinder, DocTestCase
 #-----------------------------------------------------------------------------
 # Module globals and other constants
 
@@ -79,9 +61,9 b' log = logging.getLogger(__name__)'
 # gets the job done.
 
 
-# XXX - Hack to modify the %run command so we can sync the user's namespace
-# with the test globals.  Once we move over to a clean magic system, this will
-# be done with much less ugliness.
+# Hack to modify the %run command so we can sync the user's namespace with the
+# test globals.  Once we move over to a clean magic system, this will be done
+# with much less ugliness.
 
 def _run_ns_sync(self,arg_s,runner=None):
     """Modified version of %run that syncs testing namespaces.
@@ -94,6 +76,35 b' def _run_ns_sync(self,arg_s,runner=None):'
     return out
 
 
+class ipnsdict(dict):
+    """A special subclass of dict for use as an IPython namespace in doctests.
+
+    This subclass adds a simple checkpointing capability so that when testing
+    machinery clears it (we use it as the test execution context), it doesn't
+    get completely destroyed.
+    """
+    
+    def __init__(self,*a):
+        dict.__init__(self,*a)
+        self._savedict = {}
+        
+    def clear(self):
+        dict.clear(self)
+        self.update(self._savedict)
+
+    def _checkpoint(self):
+        self._savedict.clear()
+        self._savedict.update(self)
+
+    def update(self,other):
+        self._checkpoint()
+        dict.update(self,other)
+        # If '_' is in the namespace, python won't set it when executing code,
+        # and we have examples that test it.  So we ensure that the namespace
+        # is always 'clean' of it before it's used for test code execution.
+        self.pop('_',None)
+        
+
 def start_ipython():
     """Start a global IPython shell, which we need for IPython-specific syntax.
     """
@@ -117,7 +128,10 b' def start_ipython():'
     _main = sys.modules.get('__main__')
 
     # Start IPython instance.  We customize it to start with minimal frills.
-    IPython.Shell.IPShell(['--classic','--noterm_title'])
+    user_ns,global_ns = IPython.ipapi.make_user_namespaces(ipnsdict(),dict())
+    
+    IPython.Shell.IPShell(['--classic','--noterm_title'],
+                          user_ns,global_ns)
 
     # Deactivate the various python system hooks added by ipython for
     # interactive convenience so we don't confuse the doctest system
@@ -257,7 +271,7 b' class IPDoctestOutputChecker(doctest.OutputChecker):'
     output string for flags that tell us to ignore the output.
     """
 
-    random_re = re.compile(r'#\s*random')
+    random_re = re.compile(r'#\s*random\s+')
     
     def check_output(self, want, got, optionflags):
         """Check output, accepting special markers embedded in the output.
@@ -307,12 +321,20 b' class DocTestCase(doctests.DocTestCase):'
         self._dt_setUp = setUp
         self._dt_tearDown = tearDown
 
+        # XXX - store this runner once in the object!
+        runner = IPDocTestRunner(optionflags=optionflags,
+                                 checker=checker, verbose=False)
+        self._dt_runner = runner
+
+
         # Each doctest should remember what directory it was loaded from...
         self._ori_dir = os.getcwd()
 
     # Modified runTest from the default stdlib
     def runTest(self):
         test = self._dt_test
+        runner = self._dt_runner
+        
         old = sys.stdout
         new = StringIO()
         optionflags = self._dt_optionflags
@@ -322,9 +344,6 b' class DocTestCase(doctests.DocTestCase):'
             # so add the default reporting flags
             optionflags |= _unittest_reportflags
 
-        runner = IPDocTestRunner(optionflags=optionflags,
-                                 checker=self._dt_checker, verbose=False)
-
         try:
             # Save our current directory and switch out to the one where the
             # test was originally created, in case another doctest did a
@@ -333,8 +352,8 b' class DocTestCase(doctests.DocTestCase):'
             os.chdir(self._ori_dir)
 
             runner.DIVIDER = "-"*70
-            failures, tries = runner.run(
-                test, out=new.write, clear_globs=False)
+            failures, tries = runner.run(test,out=new.write,
+                                         clear_globs=False)
         finally:
             sys.stdout = old
             os.chdir(curdir)
@@ -342,6 +361,19 b' class DocTestCase(doctests.DocTestCase):'
         if failures:
             raise self.failureException(self.format_failure(new.getvalue()))
 
+    def setUp(self):
+        """Modified test setup that syncs with ipython namespace"""
+        
+        if isinstance(self._dt_test.examples[0],IPExample):
+            # for IPython examples *only*, we swap the globals with the ipython
+            # namespace, after updating it with the globals (which doctest
+            # fills with the necessary info from the module being tested).
+            _ip.IP.user_ns.update(self._dt_test.globs)
+            self._dt_test.globs = _ip.IP.user_ns
+
+        doctests.DocTestCase.setUp(self)
+    
+
 
 # A simple subclassing of the original with a different class name, so we can
 # distinguish and treat differently IPython examples from pure python ones.
@@ -403,7 +435,7 b' class IPDocTestParser(doctest.DocTestParser):'
     # Mark a test as being fully random.  In this case, we simply append the
     # random marker ('#random') to each individual example's output.  This way
     # we don't need to modify any other code.
-    _RANDOM_TEST = re.compile(r'#\s*all-random')
+    _RANDOM_TEST = re.compile(r'#\s*all-random\s+')
 
     # Mark tests to be executed in an external process - currently unsupported.
     _EXTERNAL_IP = re.compile(r'#\s*ipdoctest:\s*EXTERNAL')
@@ -438,6 +470,8 b' class IPDocTestParser(doctest.DocTestParser):'
         output = []
         charno, lineno = 0, 0
 
+        # We make 'all random' tests by adding the '# random' mark to every
+        # block of output in the test.
         if self._RANDOM_TEST.search(string):
             random_marker = '\n# random'
         else:
@@ -605,12 +639,6 b' class IPDocTestRunner(doctest.DocTestRunner,object):'
         # for all examples, most of which won't be calling %run anyway).
         _run_ns_sync.test_globs = test.globs
 
-        # dbg
-        ## print >> sys.stderr, "Test:",test
-        ## for ex in test.examples:
-        ##     print >> sys.stderr, ex.source
-        ##     print >> sys.stderr, 'Want:\n',ex.want,'\n--'
-
         return super(IPDocTestRunner,self).run(test,
                                                compileflags,out,clear_globs)
 
@@ -635,8 +663,10 b' class ExtensionDoctest(doctests.Doctest):'
         Plugin.configure(self, options, config)
         self.doctest_tests = options.doctest_tests
         self.extension = tolist(options.doctestExtension)
-        self.finder = DocTestFinder()
+
         self.parser = doctest.DocTestParser()
+        self.finder = DocTestFinder()
+        self.checker = IPDoctestOutputChecker()
         self.globs = None
         self.extraglobs = None
 
@@ -666,6 +696,9 b' class ExtensionDoctest(doctests.Doctest):'
         if not tests:
             return
 
+        # always use whitespace and ellipsis options
+        optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
+
         tests.sort()
         module_file = module.__file__
         if module_file[-4:] in ('.pyc', '.pyo'):
@@ -675,15 +708,11 b' class ExtensionDoctest(doctests.Doctest):'
                 continue
             if not test.filename:
                 test.filename = module_file
-
-            # xxx - checker and options may be ok instantiated once outside loop
-            # always use whitespace and ellipsis options
-            optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-            checker = IPDoctestOutputChecker()
             
             yield DocTestCase(test,
                               optionflags=optionflags,
-                              checker=checker)
+                              checker=self.checker)
+
 
     def loadTestsFromFile(self, filename):
         #print 'lTF',filename  # dbg
@@ -716,7 +745,7 b' class ExtensionDoctest(doctests.Doctest):'
         """
         #print 'Filename:',filename  # dbg
 
-        # temporarily hardcoded list, will move to driver later
+        # XXX - temporarily hardcoded list, will move to driver later
         exclude = ['IPython/external/',
                    'IPython/Extensions/ipy_',
                    'IPython/platutils_win32',
@@ -747,7 +776,9 b' class IPythonDoctest(ExtensionDoctest):'
         Plugin.configure(self, options, config)
         self.doctest_tests = options.doctest_tests
         self.extension = tolist(options.doctestExtension)
+
         self.parser = IPDocTestParser()
         self.finder = DocTestFinder(parser=self.parser)
+        self.checker = IPDoctestOutputChecker()
         self.globs = None
         self.extraglobs = None

MANIFEST.in

@@ -1,6 +1,7 b''
 include README_Windows.txt
 include win32_manual_post_install.py
 include ipython.py
+include setupbase.py
 
 graft scripts
 
@@ -13,14 +14,15 b' graft IPython/config'
 graft IPython/testing
 graft IPython/tools
 
+recursive-include IPython/Extensions igrid_help*
+
 graft docs
 exclude docs/\#*
 exclude docs/man/*.1
 
-# There seems to be no way of excluding whole subdirectories, other than
-# manually excluding all their subdirs.  distutils really is horrible...
-exclude docs/attic/*
-exclude docs/build/*
+# docs subdirs we want to skip
+prune docs/attic
+prune docs/build
 
 global-exclude *~
 global-exclude *.flc

docs/Makefile

@@ -21,10 +21,27 b' help:'
 	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  changes   to make an overview over all changed/added/deprecated items"
 	@echo "  linkcheck to check all external links for integrity"
+	@echo
+	@echo "Compound utility targets:"
+	@echo "pdf          latex and then runs the PDF generation"
+	@echo "all          html and pdf"
+	@echo "dist         all, and then puts the results in dist/"
 
 clean:
 	-rm -rf build/*
 
+pdf: latex
+	cd build/latex && make all-pdf
+
+all: html pdf
+
+dist: all
+	mkdir -p dist
+	-rm -rf dist/*
+	ln build/latex/IPython.pdf dist/
+	cp -al build/html dist/
+	@echo "Build finished.  Final docs are in dist/"
+
 html:
 	mkdir -p build/html build/doctrees
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html

docs/source/changes.txt

@@ -53,6 +53,9 b' New features'
 	  the main usage of the script is for starting things on localhost.  Eventually
 	  when ipcluster is able to start things on other hosts, we will put security
 	  back.
+	* 'cd --foo' searches directory history for string foo, and jumps to that dir.
+	  Last part of dir name is checked first. If no matches for that are found,
+	  look at the whole path.
 
 Bug fixes
 ---------
@@ -64,6 +67,8 b' Bug fixes'
 	* A few subpackages has missing `__init__.py` files.
 	* The documentation is only created is Sphinx is found.  Previously, the `setup.py`
 	  script would fail if it was missing.
+	* Greedy 'cd' completion has been disabled again (it was enabled in 0.8.4)
+          
 
 Backwards incompatible changes
 ------------------------------

docs/source/conf.py

@@ -44,7 +44,7 b" copyright = '2008, The IPython Development Team'"
 # The short X.Y version.
 version = '0.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.9'
+release = '0.9.beta1'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -135,13 +135,17 b" htmlhelp_basename = 'IPythondoc'"
 latex_paper_size = 'letter'
 
 # The font size ('10pt', '11pt' or '12pt').
-latex_font_size = '10pt'
+latex_font_size = '11pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
-latex_documents = [
-  ('index', 'IPython.tex', 'IPython Documentation', 'The IPython Development Team', 'manual'),
-]
+
+latex_documents = [ ('index', 'IPython.tex', 'IPython Documentation',
+                     ur"""Brian Granger and Fernando Pérez\\
+                     With contributions from:\\
+                     Benjamin Ragan-Kelley and Ville Vainio.""",
+                     'manual'),
+                    ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.

setup.py

@@ -75,17 +75,17 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
     to_update = [
                   # FIXME - Disabled for now: we need to redo an automatic way
                   # of generating the magic info inside the rst.                
-                  #('doc/magic.tex',
+                  #('docs/magic.tex',
                   #['IPython/Magic.py'],
                   #"cd doc && ./update_magic.sh" ),
                  
-                 ('doc/ipython.1.gz',
-                  ['doc/ipython.1'],
-                  "cd doc && gzip -9c ipython.1 > ipython.1.gz"),
+                 ('docs/man/ipython.1.gz',
+                  ['docs/man/ipython.1'],
+                  "cd docs/man && gzip -9c ipython.1 > ipython.1.gz"),
 
-                 ('doc/pycolor.1.gz',
-                  ['doc/pycolor.1'],
-                  "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
+                 ('docs/man/pycolor.1.gz',
+                  ['docs/man/pycolor.1'],
+                  "cd docs/man && gzip -9c pycolor.1 > pycolor.1.gz"),
                  ]
 
     # Only build the docs is sphinx is present
@@ -101,12 +101,16 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
         # The do_sphinx scripts builds html and pdf, so just one
         # target is enough to cover all manual generation
         # to_update.append(
-        #     ('doc/manual/ipython.pdf',
-        #     ['IPython/Release.py','doc/source/ipython.rst'],
+        #     ('docs/manual/ipython.pdf',
+        #     ['IPython/Release.py','docs/source/ipython.rst'],
         #     "cd docs && python do_sphinx.py")
         # )
+        
     [ target_update(*t) for t in to_update ]
 
+    # Build the docs
+    os.system('cd docs && make dist')
+    
 #---------------------------------------------------------------------------
 # Find all the packages, package data, scripts and data_files
 #---------------------------------------------------------------------------

setupbase.py

@@ -82,7 +82,8 b' setup_args = dict('
 # Find packages
 #---------------------------------------------------------------------------
 
-def add_package(packages, pname, config=False, tests=False, scripts=False, others=None):
+def add_package(packages,pname,config=False,tests=False,scripts=False,
+                others=None):
     """
     Add a package to the list of packages, including certain subpackages.
     """
@@ -140,37 +141,74 b' def find_package_data():'
 # Find data files
 #---------------------------------------------------------------------------
 
+def make_dir_struct(tag,base,out_base):
+    """Make the directory structure of all files below a starting dir.
+
+    This is just a convenience routine to help build a nested directory
+    hierarchy because distutils is too stupid to do this by itself.
+
+    XXX - this needs a proper docstring!
+    """
+    
+    # we'll use these a lot below
+    lbase = len(base)
+    pathsep = os.path.sep
+    lpathsep = len(pathsep)
+    
+    out = []
+    for (dirpath,dirnames,filenames) in os.walk(base):
+        # we need to strip out the dirpath from the base to map it to the
+        # output (installation) path.  This requires possibly stripping the
+        # path separator, because otherwise pjoin will not work correctly
+        # (pjoin('foo/','/bar') returns '/bar').
+        
+        dp_eff = dirpath[lbase:]
+        if dp_eff.startswith(pathsep):
+            dp_eff = dp_eff[lpathsep:]
+        # The output path must be anchored at the out_base marker    
+        out_path = pjoin(out_base,dp_eff)
+        # Now we can generate the final filenames. Since os.walk only produces
+        # filenames, we must join back with the dirpath to get full valid file
+        # paths:
+        pfiles = [pjoin(dirpath,f) for f in filenames]
+        # Finally, generate the entry we need, which is a triple of (tag,output
+        # path, files) for use as a data_files parameter in install_data.
+        out.append((tag,out_path,pfiles))
+
+    return out
+    
+
 def find_data_files():
     """
     Find IPython's data_files.
+
+    Most of these are docs.
     """
     
-    # I can't find how to make distutils create a nested dir. structure, so
-    # in the meantime do it manually. Butt ugly.
-    # Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
-    # information on how to do this more cleanly once python 2.4 can be assumed.
-    # Thanks to Noel for the tip.
     docdirbase  = 'share/doc/ipython'
     manpagebase = 'share/man/man1'
 
-    # We only need to exclude from this things NOT already excluded in the
-    # MANIFEST.in file.
-    exclude     = ('.sh','.1.gz')
-    # We need to figure out how we want to package all of our rst docs?
-    # docfiles    = filter(lambda f:file_doesnt_endwith(f,exclude),glob('docs/*'))
-    examfiles   = filter(isfile, glob('docs/examples/core/*.py'))
-    examfiles.append(filter(isfile, glob('docs/examples/kernel/*.py')))
-    manpages    = filter(isfile, glob('docs/man/*.1.gz'))
+    # Simple file lists can be made by hand
+    manpages  = filter(isfile, glob('docs/man/*.1.gz'))
     igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
+
+    # For nested structures, use the utility above
+    example_files = make_dir_struct('data','docs/examples',
+                                    pjoin(docdirbase,'examples'))
+    manual_files = make_dir_struct('data','docs/dist',pjoin(docdirbase,'manual'))
+
+    # And assemble the entire output list
+    data_files = [ ('data',manpagebase, manpages),
+                   ('data',pjoin(docdirbase,'extensions'),igridhelpfiles),
+                   ] + manual_files + example_files
+                 
+    ## import pprint  # dbg
+    ## print '*'*80
+    ## print 'data files'
+    ## pprint.pprint(data_files)
+    ## print '*'*80
     
-    data_files = [#('data', docdirbase, docfiles),
-                 ('data', pjoin(docdirbase, 'examples'),examfiles),
-                 ('data', manpagebase, manpages),
-                 ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
-                 ]
-    # import pprint
-    # pprint.pprint(data_files)
-    return []
+    return data_files
 
 #---------------------------------------------------------------------------
 # Find scripts
@@ -180,14 +218,14 b' def find_scripts():'
     """
     Find IPython's scripts.
     """
-    scripts = []
-    scripts.append('IPython/kernel/scripts/ipengine')
-    scripts.append('IPython/kernel/scripts/ipcontroller')
-    scripts.append('IPython/kernel/scripts/ipcluster')
-    scripts.append('scripts/ipython')
-    scripts.append('scripts/ipythonx')
-    scripts.append('scripts/pycolor')
-    scripts.append('scripts/irunner')
+    scripts = ['IPython/kernel/scripts/ipengine',
+               'IPython/kernel/scripts/ipcontroller',
+                'IPython/kernel/scripts/ipcluster',
+               'scripts/ipython',
+               'scripts/ipythonx',
+               'scripts/pycolor',
+               'scripts/irunner',
+               ]
     
     # Script to be run by the windows binary installer after the default setup
     # routine, to add shortcuts and similar windows-only things.  Windows
@@ -202,7 +240,7 b' def find_scripts():'
     return scripts
 
 #---------------------------------------------------------------------------
-# Find scripts
+# Verify all dependencies
 #---------------------------------------------------------------------------
 
 def check_for_dependencies():

tools/make_tarball.py

@@ -4,7 +4,7 b''
 
 import os,sys,shutil
 
-basever = '0.8.3'
+basever = '0.9.0'
 
 def oscmd(c):
     print ">",c
@@ -30,7 +30,7 b' ver = verinfo()'
 if ver['branch-nick'] == 'ipython':
     tarname = 'ipython-%s.bzr.r%s.tgz' % (basever, ver['revno'])
 else:
-    tarname = 'ipython-%s.bzr.r%s.%s.tgz' % (basever, ver['revno'], ver['branch-nick'])
+    tarname = 'ipython-%s.bzr.r%s.%s.tgz' % (basever, ver['revno'],
+                                             ver['branch-nick'])
     
 oscmd('bzr export ' + tarname)
-

tools/testrel

@@ -21,8 +21,8 b' cd $ipdir'
 ./setup.py sdist --formats=gztar
 
 # Build rpms
-python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4
-python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5
+#python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4
+#python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5
 
 # Build eggs
 python2.4 ./setup_bdist_egg.py