Merge

IPython/Release.py

@@ -22,7 +22,7 b" name = 'ipython'"
 # because bdist_rpm does not accept dashes (an RPM) convention, and
 # bdist_deb does not accept underscores (a Debian convention).
 
-revision = '96'
+revision = '109'
 branch = 'ipython'
 
 if branch == 'ipython':

IPython/external/path.py

@@ -29,7 +29,10 b' Date: 9 Mar 2007'
 
 from __future__ import generators
 
-import sys, warnings, os, fnmatch, glob, shutil, codecs, md5
+import sys, warnings, os, fnmatch, glob, shutil, codecs
+# deprecated in python 2.6
+warnings.filterwarnings('ignore', r'.*md5.*')
+import md5
 
 __version__ = '2.2'
 __all__ = ['path']

IPython/iplib.py

@@ -54,6 +54,8 b' import sys'
 import tempfile
 import traceback
 import types
+import warnings
+warnings.filterwarnings('ignore', r'.*sets module*')
 from sets import Set
 from pprint import pprint, pformat
 

MANIFEST.in

@@ -22,6 +22,12 b' exclude doc/manual/*.log'
 exclude doc/manual/*.out
 exclude doc/manual/*.pl
 exclude doc/manual/*.tex
+exclude doc/build/doctrees/*
+exclude doc/build/latex/*
+exclude doc/build/html/_sources/*
+
+
+
 
 global-exclude *~
 global-exclude *.flc

doc/do_sphinx.py

@@ -60,5 +60,5 b" if sys.platform != 'win32':"
     oscmd('makeindex -s python.ist modipython.idx')
     oscmd('pdflatex ipython.tex')
     oscmd('pdflatex ipython.tex')
-
+    oscmd('cp ipython.pdf ../html')
     os.chdir('../..')

doc/source/conf.py

@@ -34,7 +34,7 b" master_doc = 'ipython'"
 
 # General substitutions.
 project = 'IPython'
-copyright = '2008, IPython team'
+copyright = '2008, Fernando Perez'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
@@ -120,7 +120,7 b" latex_font_size = '10pt'"
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
-latex_documents = [('ipython','ipython.tex','IPython Documentation','IPython developers','manual')]
+latex_documents = [('ipython','ipython.tex','IPython Documentation','Fernando Perez (and contributors)','manual')]
 
 # Additional stuff for the LaTeX preamble.
 #latex_preamble = ''

doc/source/ipython.rst

@@ -17,6 +17,21 b' Indices and tables'
 * :ref:`modindex`
 * :ref:`search`
 
+Introduction
+============
+
+This is the official documentation for IPython 0.x series (i.e. what
+we are used to refer to just as "IPython"). The original text of the
+manual (most of which is still in place) has been authored by Fernando
+Perez, but as recommended usage patterns and new features have
+emerged, this manual has been updated to reflect that fact. Most of
+the additions have been authored by Ville M. Vainio.
+
+The manual has been generated from reStructuredText source markup with
+Sphinx, which should make it much easier to keep it up-to-date in the
+future. Some reST artifacts and bugs may still be apparent in the
+documentation, but this should improve as the toolchain matures.
+
 Overview
 ========
 
@@ -181,7 +196,7 b' Windows 9x support is present, and has been reported to work fine (at'
 least on WinME).
 
 Location
-========
+--------
 
 IPython is generously hosted at http://ipython.scipy.org by the
 Enthought, Inc and the SciPy project. This site offers downloads,

setup.py

@@ -46,43 +46,19 b' from distutils.core import setup'
 
 # update the manuals when building a source dist
 if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
+    import textwrap
     from IPython.genutils import target_update
     # list of things to be updated. Each entry is a triplet of args for
     # target_update()
-    to_update = [('doc/magic.tex',
-                  ['IPython/Magic.py'],
-                  "cd doc && ./update_magic.sh" ),
-                 
-                 ('doc/manual.lyx',
-                  ['IPython/Release.py','doc/manual_base.lyx'],
-                  "cd doc && ./update_version.sh" ),
-                 
-                 ('doc/manual/manual.html',
-                  ['doc/manual.lyx',
-                   'doc/magic.tex',
-                   'doc/examples/example-gnuplot.py',
-                   'doc/examples/example-embed.py',
-                   'doc/examples/example-embed-short.py',
-                   'IPython/UserConfig/ipythonrc',
-                   ],
-                  "cd doc && "
-                  "lyxport -tt --leave --pdf "
-                  "--html -o '-noinfo -split +1 -local_icons' manual.lyx"),
-                 
-                 ('doc/new_design.pdf',
-                  ['doc/new_design.lyx'],
-                  "cd doc && lyxport -tt --pdf new_design.lyx"),
-
-                 ('doc/ipython.1.gz',
-                  ['doc/ipython.1'],
-                  "cd doc && gzip -9c ipython.1 > ipython.1.gz"),
-
-                 ('doc/pycolor.1.gz',
-                  ['doc/pycolor.1'],
-                  "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
-                 ]
-    for target in to_update:
-        target_update(*target)
+    
+    def oscmd(s):
+        print ">", s
+        os.system(s)
+        
+    oscmd("cd doc && python do_sphinx.py")
+    
+    oscmd("cd doc && gzip -9c ipython.1 > ipython.1.gz")
+    oscmd("cd doc && gzip -9c pycolor.1 > pycolor.1.gz")
 
 # Release.py contains version, authors, license, url, keywords, etc.
 execfile(pjoin('IPython','Release.py'))
@@ -113,9 +89,12 b" exclude = ('.sh','.1.gz')"
 docfiles    = filter(lambda f:file_doesnt_endwith(f,exclude),glob('doc/*'))
 
 examfiles   = filter(isfile, glob('doc/examples/*.py'))
-manfiles    = filter(isfile, glob('doc/manual/*.html')) + \
-              filter(isfile, glob('doc/manual/*.css')) + \
-              filter(isfile, glob('doc/manual/*.png'))
+manfiles    = filter(isfile, glob('doc/build/html/*'))
+manstatic = filter(isfile, glob('doc/build/html/_static/*'))
+                     
+#            filter(isfile, glob('doc/manual/*.css')) + \
+#              filter(isfile, glob('doc/manual/*.png'))
+              
 manpages    = filter(isfile, glob('doc/*.1.gz'))
 cfgfiles    = filter(isfile, glob('IPython/UserConfig/*'))
 scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor',
@@ -135,6 +114,7 b" if 'bdist_wininst' in sys.argv:"
 datafiles = [('data', docdirbase, docfiles),
              ('data', pjoin(docdirbase, 'examples'),examfiles),
              ('data', pjoin(docdirbase, 'manual'),manfiles),
+             ('data', pjoin(docdirbase, 'manual/_static'),manstatic),
              ('data', manpagebase, manpages),
              ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
              ]