##// END OF EJS Templates
Merge pull request #976 from minrk/whatsnew...
Min RK -
r5282:da777005 merge
parent child Browse files
Show More
@@ -0,0 +1,155 b''
1 """Define text roles for GitHub
2
3 * ghissue - Issue
4 * ghpull - Pull Request
5 * ghuser - User
6
7 Adapted from bitbucket example here:
8 https://bitbucket.org/birkenfeld/sphinx-contrib/src/tip/bitbucket/sphinxcontrib/bitbucket.py
9
10 Authors
11 -------
12
13 * Doug Hellmann
14 * Min RK
15 """
16 #
17 # Original Copyright (c) 2010 Doug Hellmann. All rights reserved.
18 #
19
20 from docutils import nodes, utils
21 from docutils.parsers.rst.roles import set_classes
22
23 def make_link_node(rawtext, app, type, slug, options):
24 """Create a link to a github resource.
25
26 :param rawtext: Text being replaced with link node.
27 :param app: Sphinx application context
28 :param type: Link type (issue, changeset, etc.)
29 :param slug: ID of the thing to link to
30 :param options: Options dictionary passed to role func.
31 """
32
33 try:
34 base = app.config.github_project_url
35 if not base:
36 raise AttributeError
37 if not base.endswith('/'):
38 base += '/'
39 except AttributeError, err:
40 raise ValueError('github_project_url configuration value is not set (%s)' % str(err))
41
42 ref = base + type + '/' + slug + '/'
43 set_classes(options)
44 prefix = "#"
45 if type == 'pull':
46 prefix = "PR " + prefix
47 node = nodes.reference(rawtext, prefix + utils.unescape(slug), refuri=ref,
48 **options)
49 return node
50
51 def ghissue_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
52 """Link to a GitHub issue.
53
54 Returns 2 part tuple containing list of nodes to insert into the
55 document and a list of system messages. Both are allowed to be
56 empty.
57
58 :param name: The role name used in the document.
59 :param rawtext: The entire markup snippet, with role.
60 :param text: The text marked with the role.
61 :param lineno: The line number where rawtext appears in the input.
62 :param inliner: The inliner instance that called us.
63 :param options: Directive options for customization.
64 :param content: The directive content for customization.
65 """
66
67 try:
68 issue_num = int(text)
69 if issue_num <= 0:
70 raise ValueError
71 except ValueError:
72 msg = inliner.reporter.error(
73 'GitHub issue number must be a number greater than or equal to 1; '
74 '"%s" is invalid.' % text, line=lineno)
75 prb = inliner.problematic(rawtext, rawtext, msg)
76 return [prb], [msg]
77 app = inliner.document.settings.env.app
78 #app.info('issue %r' % text)
79 if 'pull' in name.lower():
80 category = 'pull'
81 elif 'issue' in name.lower():
82 category = 'issue'
83 else:
84 msg = inliner.reporter.error(
85 'GitHub roles include "ghpull" and "ghissue", '
86 '"%s" is invalid.' % name, line=lineno)
87 prb = inliner.problematic(rawtext, rawtext, msg)
88 return [prb], [msg]
89 node = make_link_node(rawtext, app, category, str(issue_num), options)
90 return [node], []
91
92 def ghuser_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
93 """Link to a GitHub user.
94
95 Returns 2 part tuple containing list of nodes to insert into the
96 document and a list of system messages. Both are allowed to be
97 empty.
98
99 :param name: The role name used in the document.
100 :param rawtext: The entire markup snippet, with role.
101 :param text: The text marked with the role.
102 :param lineno: The line number where rawtext appears in the input.
103 :param inliner: The inliner instance that called us.
104 :param options: Directive options for customization.
105 :param content: The directive content for customization.
106 """
107 app = inliner.document.settings.env.app
108 #app.info('user link %r' % text)
109 ref = 'https://www.github.com/' + text
110 node = nodes.reference(rawtext, text, refuri=ref, **options)
111 return [node], []
112
113 def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
114 """Link to a GitHub commit.
115
116 Returns 2 part tuple containing list of nodes to insert into the
117 document and a list of system messages. Both are allowed to be
118 empty.
119
120 :param name: The role name used in the document.
121 :param rawtext: The entire markup snippet, with role.
122 :param text: The text marked with the role.
123 :param lineno: The line number where rawtext appears in the input.
124 :param inliner: The inliner instance that called us.
125 :param options: Directive options for customization.
126 :param content: The directive content for customization.
127 """
128 app = inliner.document.settings.env.app
129 #app.info('user link %r' % text)
130 try:
131 base = app.config.github_project_url
132 if not base:
133 raise AttributeError
134 if not base.endswith('/'):
135 base += '/'
136 except AttributeError, err:
137 raise ValueError('github_project_url configuration value is not set (%s)' % str(err))
138
139 ref = base + text
140 node = nodes.reference(rawtext, text[:6], refuri=ref, **options)
141 return [node], []
142
143
144 def setup(app):
145 """Install the plugin.
146
147 :param app: Sphinx application context.
148 """
149 app.info('Initializing GitHub plugin')
150 app.add_role('ghissue', ghissue_role)
151 app.add_role('ghpull', ghissue_role)
152 app.add_role('ghuser', ghuser_role)
153 app.add_role('ghcommit', ghcommit_role)
154 app.add_config_value('github_project_url', None, 'env')
155 return
@@ -1,195 +1,199 b''
1 1 # -*- coding: utf-8 -*-
2 2 #
3 3 # IPython documentation build configuration file.
4 4
5 5 # NOTE: This file has been edited manually from the auto-generated one from
6 6 # sphinx. Do NOT delete and re-generate. If any changes from sphinx are
7 7 # needed, generate a scratch one and merge by hand any new fields needed.
8 8
9 9 #
10 10 # This file is execfile()d with the current directory set to its containing dir.
11 11 #
12 12 # The contents of this file are pickled, so don't put values in the namespace
13 13 # that aren't pickleable (module imports are okay, they're removed automatically).
14 14 #
15 15 # All configuration values have a default value; values that are commented out
16 16 # serve to show the default value.
17 17
18 18 import sys, os
19 19
20 20 # If your extensions are in another directory, add it here. If the directory
21 21 # is relative to the documentation root, use os.path.abspath to make it
22 22 # absolute, like shown here.
23 23 sys.path.insert(0, os.path.abspath('../sphinxext'))
24 24
25 25 # Import support for ipython console session syntax highlighting (lives
26 26 # in the sphinxext directory defined above)
27 27 import ipython_console_highlighting
28 28
29 29 # We load the ipython release info into a dict by explicit execution
30 30 iprelease = {}
31 31 execfile('../../IPython/core/release.py',iprelease)
32 32
33 33 # General configuration
34 34 # ---------------------
35 35
36 36 # Add any Sphinx extension module names here, as strings. They can be extensions
37 37 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
38 38 extensions = [
39 39 # 'matplotlib.sphinxext.mathmpl',
40 40 'matplotlib.sphinxext.only_directives',
41 41 # 'matplotlib.sphinxext.plot_directive',
42 42 'sphinx.ext.autodoc',
43 43 'sphinx.ext.doctest',
44 44 'inheritance_diagram',
45 45 'ipython_console_highlighting',
46 46 'numpydoc', # to preprocess docstrings
47 'github', # for easy GitHub links
47 48 ]
48 49
49 50 # Add any paths that contain templates here, relative to this directory.
50 51 templates_path = ['_templates']
51 52
52 53 # The suffix of source filenames.
53 54 source_suffix = '.txt'
54 55
55 56 # The master toctree document.
56 57 master_doc = 'index'
57 58
58 59 # General substitutions.
59 60 project = 'IPython'
60 61 copyright = '2008, The IPython Development Team'
61 62
63 # ghissue config
64 github_project_url = "https://github.com/ipython/ipython"
65
62 66 # The default replacements for |version| and |release|, also used in various
63 67 # other places throughout the built documents.
64 68 #
65 69 # The full version, including alpha/beta/rc tags.
66 70 release = iprelease['version']
67 71 # The short X.Y version.
68 72 version = '.'.join(release.split('.',2)[:2])
69 73
70 74
71 75 # There are two options for replacing |today|: either, you set today to some
72 76 # non-false value, then it is used:
73 77 #today = ''
74 78 # Else, today_fmt is used as the format for a strftime call.
75 79 today_fmt = '%B %d, %Y'
76 80
77 81 # List of documents that shouldn't be included in the build.
78 82 #unused_docs = []
79 83
80 84 # List of directories, relative to source directories, that shouldn't be searched
81 85 # for source files.
82 86 exclude_dirs = ['attic']
83 87
84 88 # If true, '()' will be appended to :func: etc. cross-reference text.
85 89 #add_function_parentheses = True
86 90
87 91 # If true, the current module name will be prepended to all description
88 92 # unit titles (such as .. function::).
89 93 #add_module_names = True
90 94
91 95 # If true, sectionauthor and moduleauthor directives will be shown in the
92 96 # output. They are ignored by default.
93 97 #show_authors = False
94 98
95 99 # The name of the Pygments (syntax highlighting) style to use.
96 100 pygments_style = 'sphinx'
97 101
98 102
99 103 # Options for HTML output
100 104 # -----------------------
101 105
102 106 # The style sheet to use for HTML and HTML Help pages. A file of that name
103 107 # must exist either in Sphinx' static/ path, or in one of the custom paths
104 108 # given in html_static_path.
105 109 html_style = 'default.css'
106 110
107 111 # The name for this set of Sphinx documents. If None, it defaults to
108 112 # "<project> v<release> documentation".
109 113 #html_title = None
110 114
111 115 # The name of an image file (within the static path) to place at the top of
112 116 # the sidebar.
113 117 #html_logo = None
114 118
115 119 # Add any paths that contain custom static files (such as style sheets) here,
116 120 # relative to this directory. They are copied after the builtin static files,
117 121 # so a file named "default.css" will overwrite the builtin "default.css".
118 122 html_static_path = ['_static']
119 123
120 124 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
121 125 # using the given strftime format.
122 126 html_last_updated_fmt = '%b %d, %Y'
123 127
124 128 # If true, SmartyPants will be used to convert quotes and dashes to
125 129 # typographically correct entities.
126 130 #html_use_smartypants = True
127 131
128 132 # Custom sidebar templates, maps document names to template names.
129 133 #html_sidebars = {}
130 134
131 135 # Additional templates that should be rendered to pages, maps page names to
132 136 # template names.
133 137 #html_additional_pages = {}
134 138
135 139 # If false, no module index is generated.
136 140 #html_use_modindex = True
137 141
138 142 # If true, the reST sources are included in the HTML build as _sources/<name>.
139 143 #html_copy_source = True
140 144
141 145 # If true, an OpenSearch description file will be output, and all pages will
142 146 # contain a <link> tag referring to it. The value of this option must be the
143 147 # base URL from which the finished HTML is served.
144 148 #html_use_opensearch = ''
145 149
146 150 # If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
147 151 #html_file_suffix = ''
148 152
149 153 # Output file base name for HTML help builder.
150 154 htmlhelp_basename = 'ipythondoc'
151 155
152 156
153 157 # Options for LaTeX output
154 158 # ------------------------
155 159
156 160 # The paper size ('letter' or 'a4').
157 161 latex_paper_size = 'letter'
158 162
159 163 # The font size ('10pt', '11pt' or '12pt').
160 164 latex_font_size = '11pt'
161 165
162 166 # Grouping the document tree into LaTeX files. List of tuples
163 167 # (source start file, target name, title, author, document class [howto/manual]).
164 168
165 169 latex_documents = [
166 170 ('index', 'ipython.tex', 'IPython Documentation',
167 171 ur"""The IPython Development Team""", 'manual', True),
168 172 ('parallel/winhpc_index', 'winhpc_whitepaper.tex',
169 173 'Using IPython on Windows HPC Server 2008',
170 174 ur"Brian E. Granger", 'manual', True)
171 175 ]
172 176
173 177 # The name of an image file (relative to this directory) to place at the top of
174 178 # the title page.
175 179 #latex_logo = None
176 180
177 181 # For "manual" documents, if this is true, then toplevel headings are parts,
178 182 # not chapters.
179 183 #latex_use_parts = False
180 184
181 185 # Additional stuff for the LaTeX preamble.
182 186 #latex_preamble = ''
183 187
184 188 # Documents to append as an appendix to all manuals.
185 189 #latex_appendices = []
186 190
187 191 # If false, no module index is generated.
188 192 latex_use_modindex = True
189 193
190 194
191 195 # Cleanup
192 196 # -------
193 197 # delete release info to avoid pickling errors from sphinx
194 198
195 199 del iprelease
@@ -1,33 +1,128 b''
1 1 ================================================
2 2 Development version
3 3 ================================================
4 4
5 5 The changes listed here are a brief summary of the substantial work on IPython
6 6 since the 0.11.x release series. For more details, please consult the actual
7 7 source.
8 8
9 9 Main `ipython` branch
10 10 =====================
11 11
12 12
13 13 New features
14 14 ------------
15 15
16 16 .. Expand on this:
17 17 * **HTML Notebook**: A powerful new interface puts IPython in your browser. You
18 18 can start it with the command ``ipython notebook``. See :ref:`the Notebook
19 19 docs <htmlnotebook>` for technical details.
20 20
21 21 * **Python 3 compatibility**: IPython can now be installed from a single
22 22 codebase on Python 2 and Python 3. The installation process for Python 3
23 automatically runs 2to3.
23 automatically runs 2to3. Python 3 no longer loads a separate 'python3'
24 profile by default. It uses the same 'default' profile as in Python 2.
24 25
25 26 * **PyPy support**: The terminal interface to IPython now runs under
26 27 `PyPy <http://pypy.org/>`_.
27 28
29 * **Tabbed QtConsole**: The QtConsole now supports starting multiple kernels in
30 tabs, and has a menubar, so it looks and behaves more like a real application.
31 Keyboard enthusiasts can disable the menubar with ctrl-shift-M (:ghpull:`887`).
32
33 * **SSH Tunnels**: In 0.11, the :mod:`IPython.parallel` Client could tunnel its
34 connections to the Controller via ssh. Now, the QtConsole :ref:`supports
35 <ssh_tunnels>` ssh tunneling, as do parallel engines.
36
37 * **relaxed command-line parsing**: 0.11 was released with overly-strict
38 command-line parsing, preventing the ability to specify arguments with spaces,
39 e.g. ``ipython --pylab qt`` or ``ipython -c "print 'hi'"``. This has
40 been fixed, by using argparse. The new parsing is a strict superset of 0.11, so
41 any commands in 0.11 should still work in 0.12.
42
43 * **HistoryAccessor**: The :class:`~IPython.core.history.HistoryManager` class for
44 interacting with your IPython SQLite history database has been split, adding
45 a parent :class:`~IPython.core.history.HistoryAccessor` class, so that users can
46 write code to access and search their IPython history without being in an IPython
47 session (:ghpull:`824`).
48
49 * **kernel %gui and %pylab**: The ``%gui`` and ``%pylab`` magics have been restored
50 to the IPython kernel (e.g. in the qtconsole or notebook). This allows activation
51 of pylab-mode, or eventloop integration after starting the kernel, which was
52 unavailable in 0.11. Unlike in the terminal, this can be set only once, and
53 cannot be changed.
54
55 * **%config**: A new ``%config`` magic has been added, giving easy access to the
56 IPython configuration system at runtime (:ghpull:`923`).
57
58 * **Standalone Kernel**: ``ipython kernel`` subcommand has been added, to allow
59 starting a standalone kernel, that can be used with various frontends.
60
61 * **Multiline History**: Multiline readline history has been restored to the
62 Terminal frontend by default (:ghpull:`838`).
63
64
65
66 Major Bugs fixed
67 ----------------
68
69 * Simple configuration errors should no longer crash IPython. In 0.11, errors in
70 config files, as well as invalid trait values, could crash IPython. Now, such
71 errors are reported, and help is displayed.
72
73 * Certain SyntaxErrors no longer crash IPython (e.g. just typing keywords, such as
74 ``return``, ``break``, etc.). See :ghissue:`704`.
75
76 * IPython path utils, such as :func:`~IPython.utils.path.get_ipython_dir` now check
77 for write permissions, so IPython should function on systems where the default
78 path resolution might point to a read-only location, such as ``HOMESHARE`` on
79 Windows (:ghissue:`669`).
80
81 * :func:`raw_input` now works in the kernel when multiple frontends are in use. The
82 request will be sent to the frontend that made the request, and an exception is
83 raised if that frontend does not support stdin requests (e.g. the notebook)
84 (:ghissue:`673`).
85
86 * :mod:`zmq` version detection no longer uses simple lexicographical comparison to
87 check minimum version, which prevents 0.11 from working with pyzmq-2.1.10
88 (:ghpull:`758`).
89
90 * A bug in PySide < 1.0.7 caused crashes on OSX when tooltips were shown
91 (:ghissue:`711`). these tooltips are now disabled on old PySide (:ghpull:`963`).
92
28 93 .. * use bullet list
29 94
30 95 Backwards incompatible changes
31 96 ------------------------------
32 97
98 * IPython connection information is no longer specified via ip/port directly,
99 rather via json connection files. These files are stored in the security
100 directory, and enable us to turn on HMAC message authentication by default,
101 significantly improving the security of kernels. Various utility functions
102 have been added to :mod:`IPython.lib.kernel`, for easier connecting to existing
103 kernels.
104
105 * :class:`~IPython.zmq.kernelmanager.KernelManager` now has one ip, and several port
106 traits, rather than several ip/port pair ``_addr`` traits. This better matches the
107 rest of the code, where the ip cannot not be set separately for each channel.
108
109 * The class inheritance of the Launchers in :mod:`IPython.parallel.apps.launcher`
110 used by ipcluster has changed, so that trait names are more consistent across
111 batch systems. This may require a few renames in your config files, if you
112 customized the command-line args for launching controllers and engines. The
113 configurable names have also been changed to be clearer that they point to class
114 names, and can now be specified by name only, rather than requiring the full
115 import path of each class, e.g.::
116
117 IPClusterEngines.engine_launcher = 'IPython.parallel.apps.launcher.MPIExecEngineSetLauncher'
118 IPClusterStart.controller_launcher = 'IPython.parallel.apps.launcher.SSHControllerLauncher'
119
120 would now be specified as::
121
122 IPClusterEngines.engine_launcher_class = 'MPIExec'
123 IPClusterStart.controller_launcher_class = 'SSH'
124
125 The full path will still work, and is necessary for using custom launchers not in
126 IPython's launcher module.
127
33 128 .. * use bullet list
General Comments 0
You need to be logged in to leave comments. Login now