[Python-modules-commits] r18876 - in packages/sphinx/branches/1.1/debian (16 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Wed Oct 12 17:19:41 UTC 2011
Date: Wednesday, October 12, 2011 @ 17:19:37
Author: jwilk
Revision: 18876
New upstream release.
Added:
packages/sphinx/branches/1.1/debian/patches/disable_distribute_setup.diff
(from rev 18874, packages/sphinx/branches/1.1/debian/patches/disable_ez_setup.diff)
Modified:
packages/sphinx/branches/1.1/debian/changelog
packages/sphinx/branches/1.1/debian/control
packages/sphinx/branches/1.1/debian/dh-sphinxdoc/index
packages/sphinx/branches/1.1/debian/jstest/jstest.py
packages/sphinx/branches/1.1/debian/jstest/run-tests
packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch
packages/sphinx/branches/1.1/debian/patches/series
packages/sphinx/branches/1.1/debian/patches/show_more_stack_frames.diff
packages/sphinx/branches/1.1/debian/pyversions
packages/sphinx/branches/1.1/debian/rules
packages/sphinx/branches/1.1/debian/sphinx-autogen.1
packages/sphinx/branches/1.1/debian/sphinx-build.1
packages/sphinx/branches/1.1/debian/sphinx-quickstart.1
Deleted:
packages/sphinx/branches/1.1/debian/patches/disable_ez_setup.diff
packages/sphinx/branches/1.1/debian/patches/docstring_parse.diff
Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/changelog 2011-10-12 17:19:37 UTC (rev 18876)
@@ -1,9 +1,24 @@
-sphinx (1.0.8+dfsg-3) UNRELEASED; urgency=low
+sphinx (1.1+dfsg-1) UNRELEASED; urgency=low
+ * New upstream release.
+ + XXX FIXME XXX disable autosummary_1.0.6.patch.
+ + Drop docstring_parse.diff, applied upstream.
+ + Rename disable_ez_setup.diff to disable_distribute_setup.diff.
+ + Refresh other patches.
+ + Update integration tests for the JavaScript code.
+ + Update versions in the manual pages.
+ + Bump minimum required versions:
+ - python-docutils to >= 0.7;
+ - python-pygments to >= 1.2;
+ - python-jinja2 to >= 2.3.
+ - python to >= 2.5.
+ + Add code to install also JavaScript files that are generated at build
+ time. Add websupport.js to dh_sphinxdoc index.
+ * Texinfo output format is now supported (closes: #586747).
* Update version numbers in the manual pages. Add a build-time warning to be
emitted if they ever get out of date again.
- -- Jakub Wilk <jwilk at debian.org> Wed, 12 Oct 2011 10:46:05 +0200
+ -- Jakub Wilk <jwilk at debian.org> Wed, 12 Oct 2011 11:31:23 +0200
sphinx (1.0.8+dfsg-2) unstable; urgency=low
Modified: packages/sphinx/branches/1.1/debian/control
===================================================================
--- packages/sphinx/branches/1.1/debian/control 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/control 2011-10-12 17:19:37 UTC (rev 18876)
@@ -5,7 +5,10 @@
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Homepage: http://sphinx.pocoo.org/
Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1~), python-setuptools (>= 0.6c5-1~)
-Build-Depends-Indep: python-support (>= 0.6.4), python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1),
+Build-Depends-Indep: python-support (>= 0.6.4),
+ python-docutils (>= 0.7),
+ python-pygments (>= 1.2),
+ python-jinja2 (>= 2.3),
python-nose, python (>= 2.6.6-14~) | python-simplejson,
xvfb, xauth, python-webkit, libjs-jquery (>= 1.4), libjs-underscore,
texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended,
@@ -16,7 +19,10 @@
Package: python-sphinx
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-docutils (>= 0.5), python-pygments (>= 0.8), python-jinja2 (>= 2.2),
+Depends: ${misc:Depends}, ${python:Depends},
+ python-docutils (>= 0.7),
+ python-pygments (>= 1.2),
+ python-jinja2 (>= 2.3),
${sphinxdoc:Depends}, libjs-sphinxdoc (= ${source:Version})
Recommends: python (>= 2.6) | python-simplejson, python-imaging
Suggests: jsmath
Modified: packages/sphinx/branches/1.1/debian/dh-sphinxdoc/index
===================================================================
--- packages/sphinx/branches/1.1/debian/dh-sphinxdoc/index 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/dh-sphinxdoc/index 2011-10-12 17:19:37 UTC (rev 18876)
@@ -5,3 +5,4 @@
1.0/sidebar.js
1.0/theme_extras.js
1.0/underscore.js
+1.0/websupport.js 1.1
Modified: packages/sphinx/branches/1.1/debian/jstest/jstest.py
===================================================================
--- packages/sphinx/branches/1.1/debian/jstest/jstest.py 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/jstest/jstest.py 2011-10-12 17:19:37 UTC (rev 18876)
@@ -152,7 +152,7 @@
TestCase.__name__ = 'TestCase(%r)' % options.search_term
suite = unittest.TestLoader().loadTestsFromTestCase(TestCase)
- unittest.TextTestRunner(verbosity=2).run(suite)
+ return unittest.TextTestRunner(verbosity=2).run(suite)
def test_directory(directory, options, time_limit=default_time_limit):
# The file:/// protocol doesn't work for the time being:
@@ -162,7 +162,7 @@
url = urlparse.urljoin(http_server.base_url, 'search.html?q=' + urllib.quote_plus(options.search_term))
browser = Browser(options)
html = browser.wget(url, time_limit)
- test_html(html, options)
+ return test_html(html, options)
def main():
import argparse
Modified: packages/sphinx/branches/1.1/debian/jstest/run-tests
===================================================================
--- packages/sphinx/branches/1.1/debian/jstest/run-tests 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/jstest/run-tests 2011-10-12 17:19:37 UTC (rev 18876)
@@ -6,14 +6,14 @@
class t1:
search_term = 'example'
- n_results = 30
- n_links = 30
- n_highlights = 29
+ n_results = 34
+ n_links = 34
+ n_highlights = 32
class t2:
search_term = 'examples'
- n_results = 30
- n_links = 30
+ n_results = 34
+ n_links = 34
n_highlights = 6
class t3:
Copied: packages/sphinx/branches/1.1/debian/patches/disable_distribute_setup.diff (from rev 18874, packages/sphinx/branches/1.1/debian/patches/disable_ez_setup.diff)
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/disable_distribute_setup.diff (rev 0)
+++ packages/sphinx/branches/1.1/debian/patches/disable_distribute_setup.diff 2011-10-12 17:19:37 UTC (rev 18876)
@@ -0,0 +1,15 @@
+Description: Disable use of distribute_setup, which bootstrap distribute installation.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+Last-Update: 2011-10-12
+
+--- a/setup.py
++++ b/setup.py
+@@ -2,6 +2,7 @@
+ try:
+ from setuptools import setup, find_packages
+ except ImportError:
++ raise
+ import distribute_setup
+ distribute_setup.use_setuptools()
+ from setuptools import setup, find_packages
Deleted: packages/sphinx/branches/1.1/debian/patches/disable_ez_setup.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/disable_ez_setup.diff 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/patches/disable_ez_setup.diff 2011-10-12 17:19:37 UTC (rev 18876)
@@ -1,15 +0,0 @@
-Description: Disable use of ez_setup, which bootstrap setuptools installation.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Last-Update: 2011-08-25
-
---- a/setup.py
-+++ b/setup.py
-@@ -2,6 +2,7 @@
- try:
- from setuptools import setup, find_packages
- except ImportError:
-+ raise
- import ez_setup
- ez_setup.use_setuptools()
- from setuptools import setup, find_packages
Deleted: packages/sphinx/branches/1.1/debian/patches/docstring_parse.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/docstring_parse.diff 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/patches/docstring_parse.diff 2011-10-12 17:19:37 UTC (rev 18876)
@@ -1,209 +0,0 @@
-Description: Allow extraction of function signature from docstring for extension modules.
- Backport upstream changesets a8b0ef275438 and de340a6098c7 to allow extraction
- of function signature from docstring for extension modules.
- .
- Please note that the feature is disabled by default for the time being.
-Bug-Debian: http://bugs.debian.org/630409
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/564
-Forwarded: not-needed
-
---- a/doc/ext/autodoc.rst
-+++ b/doc/ext/autodoc.rst
-@@ -260,6 +260,22 @@
-
- .. versionadded:: 1.0
-
-+.. confval:: autodoc_docstring_signature
-+
-+ Functions imported from C modules cannot be introspected, and therefore the
-+ signature for such functions cannot be automatically determined. However, it
-+ is an often-used convention to put the signature into the first line of the
-+ function's docstring.
-+
-+ If this boolean value is set to ``True``, autodoc will look at the
-+ first line of the docstring for functions and methods, and if it
-+ looks like a signature, use the line as the signature and remove it
-+ from the docstring content.
-+
-+ The default is ``False``.
-+
-+ .. versionadded:: 1.1
-+
-
- Docstring preprocessing
- -----------------------
---- a/sphinx/ext/autodoc.py
-+++ b/sphinx/ext/autodoc.py
-@@ -426,13 +426,13 @@
- # etc. don't support a prepended module name
- self.add_line(u' :module: %s' % self.modname, '<autodoc>')
-
-- def get_doc(self, encoding=None):
-+ def get_doc(self, encoding=None, ignore=1):
- """Decode and return lines of the docstring(s) for the object."""
- docstring = self.get_attr(self.object, '__doc__', None)
- if docstring:
- # make sure we have Unicode docstrings, then sanitize and split
- # into lines
-- return [prepare_docstring(force_decode(docstring, encoding))]
-+ return [prepare_docstring(force_decode(docstring, encoding), ignore)]
- return []
-
- def process_doc(self, docstrings):
-@@ -833,7 +833,53 @@
- return modname, parents + [base]
-
-
--class FunctionDocumenter(ModuleLevelDocumenter):
-+class DocstringSignatureMixin(object):
-+ """
-+ Mixin for FunctionDocumenter and MethodDocumenter to provide the
-+ feature of reading the signature from the docstring.
-+ """
-+
-+ def _find_signature(self, encoding=None):
-+ docstrings = Documenter.get_doc(self, encoding, 2)
-+ if len(docstrings) != 1:
-+ return
-+ doclines = docstrings[0]
-+ setattr(self, '__new_doclines', doclines)
-+ if not doclines:
-+ return
-+ # match first line of docstring against signature RE
-+ match = py_ext_sig_re.match(doclines[0])
-+ if not match:
-+ return
-+ exmod, path, base, args, retann = match.groups()
-+ # the base name must match ours
-+ if not self.objpath or base != self.objpath[-1]:
-+ return
-+ # ok, now jump over remaining empty lines and set the remaining
-+ # lines as the new doclines
-+ i = 1
-+ while i < len(doclines) and not doclines[i].strip():
-+ i += 1
-+ setattr(self, '__new_doclines', doclines[i:])
-+ return args, retann
-+
-+ def get_doc(self, encoding=None, ignore=1):
-+ lines = getattr(self, '__new_doclines', None)
-+ if lines is not None:
-+ return [lines]
-+ return Documenter.get_doc(self, encoding, ignore)
-+
-+ def format_signature(self):
-+ if self.args is None and self.env.config.autodoc_docstring_signature:
-+ # only act if a signature is not explicitly given already, and if
-+ # the feature is enabled
-+ result = self._find_signature()
-+ if result is not None:
-+ self.args, self.retann = result
-+ return Documenter.format_signature(self)
-+
-+
-+class FunctionDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):
- """
- Specialized Documenter subclass for functions.
- """
-@@ -847,7 +893,7 @@
- def format_args(self):
- if inspect.isbuiltin(self.object) or \
- inspect.ismethoddescriptor(self.object):
-- # can never get arguments of a C function or method
-+ # cannot introspect arguments of a C function or method
- return None
- try:
- argspec = inspect.getargspec(self.object)
-@@ -937,7 +983,7 @@
- self.add_line(_(u' Bases: %s') % ', '.join(bases),
- '<autodoc>')
-
-- def get_doc(self, encoding=None):
-+ def get_doc(self, encoding=None, ignore=1):
- content = self.env.config.autoclass_content
-
- docstrings = []
-@@ -1010,7 +1056,7 @@
- pass
-
-
--class MethodDocumenter(ClassLevelDocumenter):
-+class MethodDocumenter(DocstringSignatureMixin, ClassLevelDocumenter):
- """
- Specialized Documenter subclass for methods (normal, static and class).
- """
-@@ -1226,6 +1272,7 @@
- app.add_config_value('autoclass_content', 'class', True)
- app.add_config_value('autodoc_member_order', 'alphabetic', True)
- app.add_config_value('autodoc_default_flags', [], True)
-+ app.add_config_value('autodoc_docstring_signature', False, True)
- app.add_event('autodoc-process-docstring')
- app.add_event('autodoc-process-signature')
- app.add_event('autodoc-skip-member')
---- a/sphinx/util/docstrings.py
-+++ b/sphinx/util/docstrings.py
-@@ -12,7 +12,7 @@
- import sys
-
-
--def prepare_docstring(s):
-+def prepare_docstring(s, ignore=1):
- """
- Convert a docstring into lines of parseable reST. Return it as a list of
- lines usable for inserting into a docutils ViewList (used as argument
-@@ -20,18 +20,19 @@
- this docstring and following content.
- """
- lines = s.expandtabs().splitlines()
-- # Find minimum indentation of any non-blank lines after first line.
-+ # Find minimum indentation of any non-blank lines after ignored lines.
- margin = sys.maxint
-- for line in lines[1:]:
-+ for line in lines[ignore:]:
- content = len(line.lstrip())
- if content:
- indent = len(line) - content
- margin = min(margin, indent)
-- # Remove indentation.
-- if lines:
-- lines[0] = lines[0].lstrip()
-+ # Remove indentation from ignored lines.
-+ for i in range(ignore):
-+ if i < len(lines):
-+ lines[i] = lines[i].lstrip()
- if margin < sys.maxint:
-- for i in range(1, len(lines)): lines[i] = lines[i][margin:]
-+ for i in range(ignore, len(lines)): lines[i] = lines[i][margin:]
- # Remove any leading blank lines.
- while lines and not lines[0]:
- lines.pop(0)
---- a/tests/test_autodoc.py
-+++ b/tests/test_autodoc.py
-@@ -501,6 +501,14 @@
- 'attribute', 'mdocattr')
- del directive.env.temp_data['autodoc:class']
-
-+ # test autodoc_docstring_signature
-+ directive.env.config.autodoc_docstring_signature = True
-+ assert_result_contains(
-+ '.. py:method:: DocstringSig.meth(FOO, BAR=1) -> BAZ', 'method',
-+ 'test_autodoc.DocstringSig.meth')
-+ assert_result_contains(
-+ ' rest of docstring', 'method', 'test_autodoc.DocstringSig.meth')
-+
-
- # --- generate fodder ------------
-
-@@ -595,3 +603,12 @@
-
- # should be documented as an alias
- factory = dict
-+
-+
-+class DocstringSig(object):
-+ def meth(self):
-+ """meth(FOO, BAR=1) -> BAZ
-+First line of docstring
-+
-+ rest of docstring
-+ """
Modified: packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch 2011-10-12 17:19:37 UTC (rev 18876)
@@ -5,9 +5,9 @@
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
-@@ -15,7 +15,7 @@
- __version__ = '1.0.8'
- __released__ = '1.0.8' # used when Sphinx builds its own docs
+@@ -18,7 +18,7 @@
+ __version__ = '1.1'
+ __released__ = '1.1' # used when Sphinx builds its own docs
-package_dir = path.abspath(path.dirname(__file__))
+package_dir = '/usr/share/sphinx/'
@@ -16,8 +16,8 @@
# try to find out the changeset hash if checked out from hg, and append
--- a/tests/run.py
+++ b/tests/run.py
-@@ -14,7 +14,10 @@
- from os import path
+@@ -24,7 +24,10 @@
+ chdir(newroot)
# always test the sphinx package from this directory
-sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
@@ -30,9 +30,9 @@
import nose
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
-@@ -12,6 +12,7 @@
+@@ -11,6 +11,7 @@
+
from os import path
- from cStringIO import StringIO
+from sphinx import package_dir
from sphinx.errors import PycodeError
@@ -49,7 +49,7 @@
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
from jinja2 import FileSystemLoader, TemplateNotFound
from jinja2.sandbox import SandboxedEnvironment
@@ -57,7 +57,7 @@
from sphinx.ext.autosummary import import_by_name, get_documenter
from sphinx.jinja2glue import BuiltinTemplateLoader
from sphinx.util.osutil import ensuredir
-@@ -77,7 +78,7 @@
+@@ -78,7 +79,7 @@
sources = [os.path.join(base_path, filename) for filename in sources]
# create our own templating environment
Modified: packages/sphinx/branches/1.1/debian/patches/series
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/series 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/patches/series 2011-10-12 17:19:37 UTC (rev 18876)
@@ -1,6 +1,5 @@
-disable_ez_setup.diff
-autosummary_1.0.6.patch
+disable_distribute_setup.diff
+#autosummary_1.0.6.patch
move_static_files_outside_site-packages.patch
unversioned_grammar_pickle.diff
show_more_stack_frames.diff
-docstring_parse.diff
Modified: packages/sphinx/branches/1.1/debian/patches/show_more_stack_frames.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/show_more_stack_frames.diff 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/patches/show_more_stack_frames.diff 2011-10-12 17:19:37 UTC (rev 18876)
@@ -14,7 +14,7 @@
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -212,7 +212,7 @@
- print >>error, unicode(err).encode('ascii', 'backslashreplace')
+ print >>error, terminal_safe(unicode(err))
else:
print >>error, red('Exception occurred:')
- print >>error, format_exception_cut_frames().rstrip()
Modified: packages/sphinx/branches/1.1/debian/pyversions
===================================================================
--- packages/sphinx/branches/1.1/debian/pyversions 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/pyversions 2011-10-12 17:19:37 UTC (rev 18876)
@@ -1 +1 @@
-2.4-
+2.5-
Modified: packages/sphinx/branches/1.1/debian/rules
===================================================================
--- packages/sphinx/branches/1.1/debian/rules 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/rules 2011-10-12 17:19:37 UTC (rev 18876)
@@ -73,6 +73,10 @@
install -m 755 $(CURDIR)/sphinx-autogen.py $(PACKAGE_DIR)/usr/bin/sphinx-autogen
# Move JavaScript code to libjs-sphinxdoc:
set -e; \
+ for js in $$(find build/html/_static/ -name '*.js'); do \
+ cp -f $$js debian/libjs-sphinxdoc/$(javascript_path); \
+ done
+ set -e; \
for js in $$(find $(PACKAGE_DIR)/usr/share/sphinx/themes/ -name '*.js'); do \
mv $$js debian/libjs-sphinxdoc/$(javascript_path); \
ln -sf "$(javascript_path)/$${js##*/}" $$js; \
Modified: packages/sphinx/branches/1.1/debian/sphinx-autogen.1
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-autogen.1 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/sphinx-autogen.1 2011-10-12 17:19:37 UTC (rev 18876)
@@ -1,4 +1,4 @@
-.TH sphinx\-autogen 1 "Aug 2010" "Sphinx 1.0.8" "User Commands"
+.TH sphinx\-autogen 1 "Aug 2010" "Sphinx 1.1" "User Commands"
.SH NAME
sphinx\-autogen \- generate ReStructuredText using \fBautosummary\fR
Modified: packages/sphinx/branches/1.1/debian/sphinx-build.1
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-build.1 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/sphinx-build.1 2011-10-12 17:19:37 UTC (rev 18876)
@@ -1,4 +1,4 @@
-.TH sphinx-build 1 "Aug 2010" "Sphinx 1.0.8" "User Commands"
+.TH sphinx-build 1 "Aug 2010" "Sphinx 1.1" "User Commands"
.SH NAME
sphinx-build \- Sphinx documentation generator tool
.SH SYNOPSIS
Modified: packages/sphinx/branches/1.1/debian/sphinx-quickstart.1
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-quickstart.1 2011-10-12 09:30:16 UTC (rev 18875)
+++ packages/sphinx/branches/1.1/debian/sphinx-quickstart.1 2011-10-12 17:19:37 UTC (rev 18876)
@@ -1,4 +1,4 @@
-.TH sphinx-quickstart 1 "Aug 2010" "Sphinx 1.0.8" "User Commands"
+.TH sphinx-quickstart 1 "Aug 2010" "Sphinx 1.1" "User Commands"
.SH NAME
sphinx-quickstart \- Sphinx documentation template generator
.SH SYNOPSIS
More information about the Python-modules-commits
mailing list