Show More
The requested changes are too big and content was truncated. Show full diff
@@ -22,7 +22,7 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 = '9 |
|
25 | revision = '109' | |
26 | branch = 'ipython' |
|
26 | branch = 'ipython' | |
27 |
|
27 | |||
28 | if branch == 'ipython': |
|
28 | if branch == 'ipython': |
@@ -29,7 +29,10 b' Date: 9 Mar 2007' | |||||
29 |
|
29 | |||
30 | from __future__ import generators |
|
30 | from __future__ import generators | |
31 |
|
31 | |||
32 |
import sys, warnings, os, fnmatch, glob, shutil, codecs |
|
32 | import sys, warnings, os, fnmatch, glob, shutil, codecs | |
|
33 | # deprecated in python 2.6 | |||
|
34 | warnings.filterwarnings('ignore', r'.*md5.*') | |||
|
35 | import md5 | |||
33 |
|
36 | |||
34 | __version__ = '2.2' |
|
37 | __version__ = '2.2' | |
35 | __all__ = ['path'] |
|
38 | __all__ = ['path'] |
@@ -54,6 +54,8 b' import sys' | |||||
54 | import tempfile |
|
54 | import tempfile | |
55 | import traceback |
|
55 | import traceback | |
56 | import types |
|
56 | import types | |
|
57 | import warnings | |||
|
58 | warnings.filterwarnings('ignore', r'.*sets module*') | |||
57 | from sets import Set |
|
59 | from sets import Set | |
58 | from pprint import pprint, pformat |
|
60 | from pprint import pprint, pformat | |
59 |
|
61 |
@@ -22,6 +22,12 b' exclude doc/manual/*.log' | |||||
22 | exclude doc/manual/*.out |
|
22 | exclude doc/manual/*.out | |
23 | exclude doc/manual/*.pl |
|
23 | exclude doc/manual/*.pl | |
24 | exclude doc/manual/*.tex |
|
24 | exclude doc/manual/*.tex | |
|
25 | exclude doc/build/doctrees/* | |||
|
26 | exclude doc/build/latex/* | |||
|
27 | exclude doc/build/html/_sources/* | |||
|
28 | ||||
|
29 | ||||
|
30 | ||||
25 |
|
31 | |||
26 | global-exclude *~ |
|
32 | global-exclude *~ | |
27 | global-exclude *.flc |
|
33 | global-exclude *.flc |
@@ -60,5 +60,5 b" if sys.platform != 'win32':" | |||||
60 | oscmd('makeindex -s python.ist modipython.idx') |
|
60 | oscmd('makeindex -s python.ist modipython.idx') | |
61 | oscmd('pdflatex ipython.tex') |
|
61 | oscmd('pdflatex ipython.tex') | |
62 | oscmd('pdflatex ipython.tex') |
|
62 | oscmd('pdflatex ipython.tex') | |
63 |
|
63 | oscmd('cp ipython.pdf ../html') | ||
64 | os.chdir('../..') |
|
64 | os.chdir('../..') |
@@ -34,7 +34,7 b" master_doc = 'ipython'" | |||||
34 |
|
34 | |||
35 | # General substitutions. |
|
35 | # General substitutions. | |
36 | project = 'IPython' |
|
36 | project = 'IPython' | |
37 |
copyright = '2008, |
|
37 | copyright = '2008, Fernando Perez' | |
38 |
|
38 | |||
39 | # The default replacements for |version| and |release|, also used in various |
|
39 | # The default replacements for |version| and |release|, also used in various | |
40 | # other places throughout the built documents. |
|
40 | # other places throughout the built documents. | |
@@ -120,7 +120,7 b" latex_font_size = '10pt'" | |||||
120 |
|
120 | |||
121 | # Grouping the document tree into LaTeX files. List of tuples |
|
121 | # Grouping the document tree into LaTeX files. List of tuples | |
122 | # (source start file, target name, title, author, document class [howto/manual]). |
|
122 | # (source start file, target name, title, author, document class [howto/manual]). | |
123 |
latex_documents = [('ipython','ipython.tex','IPython Documentation',' |
|
123 | latex_documents = [('ipython','ipython.tex','IPython Documentation','Fernando Perez (and contributors)','manual')] | |
124 |
|
124 | |||
125 | # Additional stuff for the LaTeX preamble. |
|
125 | # Additional stuff for the LaTeX preamble. | |
126 | #latex_preamble = '' |
|
126 | #latex_preamble = '' |
@@ -17,6 +17,21 b' Indices and tables' | |||||
17 | * :ref:`modindex` |
|
17 | * :ref:`modindex` | |
18 | * :ref:`search` |
|
18 | * :ref:`search` | |
19 |
|
19 | |||
|
20 | Introduction | |||
|
21 | ============ | |||
|
22 | ||||
|
23 | This is the official documentation for IPython 0.x series (i.e. what | |||
|
24 | we are used to refer to just as "IPython"). The original text of the | |||
|
25 | manual (most of which is still in place) has been authored by Fernando | |||
|
26 | Perez, but as recommended usage patterns and new features have | |||
|
27 | emerged, this manual has been updated to reflect that fact. Most of | |||
|
28 | the additions have been authored by Ville M. Vainio. | |||
|
29 | ||||
|
30 | The manual has been generated from reStructuredText source markup with | |||
|
31 | Sphinx, which should make it much easier to keep it up-to-date in the | |||
|
32 | future. Some reST artifacts and bugs may still be apparent in the | |||
|
33 | documentation, but this should improve as the toolchain matures. | |||
|
34 | ||||
20 | Overview |
|
35 | Overview | |
21 | ======== |
|
36 | ======== | |
22 |
|
37 | |||
@@ -181,7 +196,7 b' Windows 9x support is present, and has been reported to work fine (at' | |||||
181 | least on WinME). |
|
196 | least on WinME). | |
182 |
|
197 | |||
183 | Location |
|
198 | Location | |
184 | ======== |
|
199 | -------- | |
185 |
|
200 | |||
186 | IPython is generously hosted at http://ipython.scipy.org by the |
|
201 | IPython is generously hosted at http://ipython.scipy.org by the | |
187 | Enthought, Inc and the SciPy project. This site offers downloads, |
|
202 | Enthought, Inc and the SciPy project. This site offers downloads, |
@@ -46,43 +46,19 b' from distutils.core import setup' | |||||
46 |
|
46 | |||
47 | # update the manuals when building a source dist |
|
47 | # update the manuals when building a source dist | |
48 | if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'): |
|
48 | if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'): | |
|
49 | import textwrap | |||
49 | from IPython.genutils import target_update |
|
50 | from IPython.genutils import target_update | |
50 | # list of things to be updated. Each entry is a triplet of args for |
|
51 | # list of things to be updated. Each entry is a triplet of args for | |
51 | # target_update() |
|
52 | # target_update() | |
52 | to_update = [('doc/magic.tex', |
|
53 | ||
53 | ['IPython/Magic.py'], |
|
54 | def oscmd(s): | |
54 | "cd doc && ./update_magic.sh" ), |
|
55 | print ">", s | |
55 |
|
56 | os.system(s) | ||
56 | ('doc/manual.lyx', |
|
57 | ||
57 | ['IPython/Release.py','doc/manual_base.lyx'], |
|
58 | oscmd("cd doc && python do_sphinx.py") | |
58 | "cd doc && ./update_version.sh" ), |
|
59 | ||
59 |
|
60 | oscmd("cd doc && gzip -9c ipython.1 > ipython.1.gz") | ||
60 | ('doc/manual/manual.html', |
|
61 | oscmd("cd doc && gzip -9c pycolor.1 > pycolor.1.gz") | |
61 | ['doc/manual.lyx', |
|
|||
62 | 'doc/magic.tex', |
|
|||
63 | 'doc/examples/example-gnuplot.py', |
|
|||
64 | 'doc/examples/example-embed.py', |
|
|||
65 | 'doc/examples/example-embed-short.py', |
|
|||
66 | 'IPython/UserConfig/ipythonrc', |
|
|||
67 | ], |
|
|||
68 | "cd doc && " |
|
|||
69 | "lyxport -tt --leave --pdf " |
|
|||
70 | "--html -o '-noinfo -split +1 -local_icons' manual.lyx"), |
|
|||
71 |
|
||||
72 | ('doc/new_design.pdf', |
|
|||
73 | ['doc/new_design.lyx'], |
|
|||
74 | "cd doc && lyxport -tt --pdf new_design.lyx"), |
|
|||
75 |
|
||||
76 | ('doc/ipython.1.gz', |
|
|||
77 | ['doc/ipython.1'], |
|
|||
78 | "cd doc && gzip -9c ipython.1 > ipython.1.gz"), |
|
|||
79 |
|
||||
80 | ('doc/pycolor.1.gz', |
|
|||
81 | ['doc/pycolor.1'], |
|
|||
82 | "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"), |
|
|||
83 | ] |
|
|||
84 | for target in to_update: |
|
|||
85 | target_update(*target) |
|
|||
86 |
|
62 | |||
87 | # Release.py contains version, authors, license, url, keywords, etc. |
|
63 | # Release.py contains version, authors, license, url, keywords, etc. | |
88 | execfile(pjoin('IPython','Release.py')) |
|
64 | execfile(pjoin('IPython','Release.py')) | |
@@ -113,9 +89,12 b" exclude = ('.sh','.1.gz')" | |||||
113 | docfiles = filter(lambda f:file_doesnt_endwith(f,exclude),glob('doc/*')) |
|
89 | docfiles = filter(lambda f:file_doesnt_endwith(f,exclude),glob('doc/*')) | |
114 |
|
90 | |||
115 | examfiles = filter(isfile, glob('doc/examples/*.py')) |
|
91 | examfiles = filter(isfile, glob('doc/examples/*.py')) | |
116 |
manfiles = filter(isfile, glob('doc/ |
|
92 | manfiles = filter(isfile, glob('doc/build/html/*')) | |
117 | filter(isfile, glob('doc/manual/*.css')) + \ |
|
93 | manstatic = filter(isfile, glob('doc/build/html/_static/*')) | |
118 | filter(isfile, glob('doc/manual/*.png')) |
|
94 | ||
|
95 | # filter(isfile, glob('doc/manual/*.css')) + \ | |||
|
96 | # filter(isfile, glob('doc/manual/*.png')) | |||
|
97 | ||||
119 | manpages = filter(isfile, glob('doc/*.1.gz')) |
|
98 | manpages = filter(isfile, glob('doc/*.1.gz')) | |
120 | cfgfiles = filter(isfile, glob('IPython/UserConfig/*')) |
|
99 | cfgfiles = filter(isfile, glob('IPython/UserConfig/*')) | |
121 | scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor', |
|
100 | scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor', | |
@@ -135,6 +114,7 b" if 'bdist_wininst' in sys.argv:" | |||||
135 | datafiles = [('data', docdirbase, docfiles), |
|
114 | datafiles = [('data', docdirbase, docfiles), | |
136 | ('data', pjoin(docdirbase, 'examples'),examfiles), |
|
115 | ('data', pjoin(docdirbase, 'examples'),examfiles), | |
137 | ('data', pjoin(docdirbase, 'manual'),manfiles), |
|
116 | ('data', pjoin(docdirbase, 'manual'),manfiles), | |
|
117 | ('data', pjoin(docdirbase, 'manual/_static'),manstatic), | |||
138 | ('data', manpagebase, manpages), |
|
118 | ('data', manpagebase, manpages), | |
139 | ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles), |
|
119 | ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles), | |
140 | ] |
|
120 | ] |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed | ||
The requested commit or file is too big and content was truncated. Show full diff |
General Comments 0
You need to be logged in to leave comments.
Login now