[Python-modules-commits] r23873 - in packages/sphinx/trunk/debian (18 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Sun Apr 7 23:27:48 UTC 2013
Date: Sunday, April 7, 2013 @ 23:27:46
Author: jwilk
Revision: 23873
New upstream beta release.
Modified:
packages/sphinx/trunk/debian/changelog
packages/sphinx/trunk/debian/copyright
packages/sphinx/trunk/debian/jstest/run-tests
packages/sphinx/trunk/debian/patches/parallel_2to3.diff
packages/sphinx/trunk/debian/patches/pygments_byte_strings.diff
packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff
packages/sphinx/trunk/debian/patches/series
packages/sphinx/trunk/debian/patches/show_more_stack_frames.diff
packages/sphinx/trunk/debian/patches/skiptest_latex.diff
packages/sphinx/trunk/debian/python-sphinx.docs
packages/sphinx/trunk/debian/sphinx-doc.docs
Deleted:
packages/sphinx/trunk/debian/patches/fix_nepali_po.diff
packages/sphinx/trunk/debian/patches/fix_shorthandoff.diff
packages/sphinx/trunk/debian/patches/l10n_fixes.diff
packages/sphinx/trunk/debian/patches/manpage_writer_docutils_0.10_api.diff
packages/sphinx/trunk/debian/patches/sort_stopwords.diff
packages/sphinx/trunk/debian/patches/support_python_3.3.diff
packages/sphinx/trunk/debian/patches/test_build_html_rb.diff
Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/changelog 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,3 +1,19 @@
+sphinx (1.2~b1+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream beta release.
+ + Drop fix_nepali_po.diff, applied upstream.
+ + Drop fix_shorthandoff.diff, different fix applied upstream.
+ + Drop test_build_html_rb.diff, applied upstream.
+ + Drop sort_stopwords.diff, applied upstream.
+ + Drop support_python_3.3.diff, applied upstream.
+ + Drop l10n_fixes.diff, applied upstream.
+ + Drop manpage_writer_docutils_0.10_api.diff applied upstream.
+ + Refresh other patches.
+ + Update integration tests for the JavaScript code.
+ + Update debian/copyright.
+
+ -- Jakub Wilk <jwilk at debian.org> Mon, 08 Apr 2013 01:03:52 +0200
+
sphinx (1.1.3+dfsg-7) experimental; urgency=low
* Backport upstream patch for fix compatibility with Docutils 0.10.
Modified: packages/sphinx/trunk/debian/copyright
===================================================================
--- packages/sphinx/trunk/debian/copyright 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/copyright 2013-04-07 23:27:46 UTC (rev 23873)
@@ -10,7 +10,7 @@
License for Sphinx
==================
-Copyright (c) 2007-2011 by the Sphinx team (see AUTHORS file).
+Copyright (c) 2007-2013 by the Sphinx team (see AUTHORS file).
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: packages/sphinx/trunk/debian/jstest/run-tests
===================================================================
--- packages/sphinx/trunk/debian/jstest/run-tests 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/jstest/run-tests 2013-04-07 23:27:46 UTC (rev 23873)
@@ -7,21 +7,21 @@
class t1:
search_term = 'example'
- n_results = 35
- n_links = 35
- n_highlights = 32
+ n_results = 25
+ n_links = 25
+ n_highlights = 24
class t2:
search_term = 'examples'
- n_results = 35
- n_links = 35
+ n_results = 25
+ n_links = 25
n_highlights = 6
class t3:
search_term = 'graph'
- n_results = 12
- n_links = 12
- n_highlights = 3
+ n_results = 9
+ n_links = 9
+ n_highlights = 1
if __name__ == '__main__':
if not os.getenv('DISPLAY'):
Deleted: packages/sphinx/trunk/debian/patches/fix_nepali_po.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_nepali_po.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/fix_nepali_po.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,31 +0,0 @@
-Description: remove Nepali translations that must have been wrong
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/changeset/3e6a1cab6c2b
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/900/format-string-errors-in-nepali-translation
-Last-Update: 2012-03-25
-
---- a/sphinx/locale/ne/LC_MESSAGES/sphinx.po
-+++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.po
-@@ -600,7 +600,7 @@
- #: sphinx/themes/basic/layout.html:122
- #, python-format
- msgid "Search within %(docstitle)s"
--msgstr "à¤à¤¿à¤¤à¥à¤°-à¤à¤¿à¤¤à¥à¤°à¥ˆ खोजà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
-+msgstr ""
-
- #: sphinx/themes/basic/layout.html:131
- msgid "About these documents"
-@@ -630,12 +630,12 @@
- msgid ""
- "Created using <a href=\"http://sphinx.pocoo.org/\">Sphinx</a> "
- "%(sphinx_version)s."
--msgstr "<a href=\"http://sphinx.pocoo.org/\">Sphinx</a> पà¥à¤°à¤¯à¥‹à¤— गरेर बनाइà¤à¤•à¥‹"
-+msgstr ""
-
- #: sphinx/themes/basic/opensearch.xml:4
- #, python-format
- msgid "Search %(docstitle)s"
--msgstr "खोजà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
-+msgstr ""
-
- #: sphinx/themes/basic/relations.html:11
- msgid "Previous topic"
Deleted: packages/sphinx/trunk/debian/patches/fix_shorthandoff.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_shorthandoff.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/fix_shorthandoff.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,24 +0,0 @@
-Description: LaTeX writer: fix generation of \shorthandoff
- With Docutils ≥ 0.8, Babel.language is a full language name (rather than
- unparsed language code), which made ExtBabel.get_shorthandoff() always return
- empty string. Use Babel.get_language() instead, which returns full language
- name regardless of Docutils version.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug-Debian: http://bugs.debian.org/672586
-Bug-Ubuntu: https://launchpad.net/bugs/997891
-Forwarded: yes
-Last-Update: 2012-05-24
-
---- a/sphinx/writers/latex.py
-+++ b/sphinx/writers/latex.py
-@@ -99,8 +99,8 @@
-
- class ExtBabel(Babel):
- def get_shorthandoff(self):
-- shortlang = self.language.split('_')[0]
-- if shortlang in ('de', 'sl', 'pt', 'es', 'nl', 'pl', 'it'):
-+ if self.get_language() in ('ngerman', 'slovene', 'portuges', 'spanish',
-+ 'dutch', 'polish', 'italian'):
- return '\\shorthandoff{"}'
- return ''
-
Deleted: packages/sphinx/trunk/debian/patches/l10n_fixes.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/l10n_fixes.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/l10n_fixes.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,74 +0,0 @@
-Description: fix l10n build of text containing footnotes or external links
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/955
-Bug-Debian: http://bugs.debian.org/691719
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/b7b808e468
- and https://bitbucket.org/birkenfeld/sphinx/commits/870a91ca86
-Author: Takayuki Shimizukawa <shimizukawa at gmail.com>
-Last-Update: 2012-12-08
-
---- a/sphinx/environment.py 2012-03-12 12:18:37 +0000
-+++ b/sphinx/environment.py 2012-12-07 12:22:33 +0000
-@@ -213,16 +213,61 @@
- parser = RSTParser()
-
- for node, msg in extract_messages(self.document):
-- patch = new_document(source, settings)
- msgstr = catalog.gettext(msg)
- # XXX add marker to untranslated parts
- if not msgstr or msgstr == msg: # as-of-yet untranslated
- continue
-+
-+ patch = new_document(source, settings)
- parser.parse(msgstr, patch)
- patch = patch[0]
- # XXX doctest and other block markup
- if not isinstance(patch, nodes.paragraph):
- continue # skip for now
-+
-+ # auto-numbered foot note reference should use original 'ids'.
-+ is_autonumber_footnote_ref = lambda node: \
-+ isinstance(node, nodes.footnote_reference) \
-+ and node.get('auto') == 1
-+ old_foot_refs = node.traverse(is_autonumber_footnote_ref)
-+ new_foot_refs = patch.traverse(is_autonumber_footnote_ref)
-+ if len(old_foot_refs) != len(new_foot_refs):
-+ env.warn_node('inconsistent footnote references in '
-+ 'translated message', node)
-+ for old, new in zip(old_foot_refs, new_foot_refs):
-+ new['ids'] = old['ids']
-+ self.document.autofootnote_refs.remove(old)
-+ self.document.note_autofootnote_ref(new)
-+
-+ # reference should use original 'refname'.
-+ # * reference target ".. _Python: ..." is not translatable.
-+ # * section refname is not translatable.
-+ # * inline reference "`Python <...>`_" has no 'refname'.
-+ is_refnamed_ref = lambda node: \
-+ isinstance(node, nodes.reference) \
-+ and 'refname' in node
-+ old_refs = node.traverse(is_refnamed_ref)
-+ new_refs = patch.traverse(is_refnamed_ref)
-+ applied_refname_map = {}
-+ if len(old_refs) != len(new_refs):
-+ env.warn_node('inconsistent references in '
-+ 'translated message', node)
-+ for new in new_refs:
-+ if new['refname'] in applied_refname_map:
-+ # 2nd appearance of the reference
-+ new['refname'] = applied_refname_map[new['refname']]
-+ elif old_refs:
-+ # 1st appearance of the reference in old_refs
-+ old = old_refs.pop(0)
-+ refname = old['refname']
-+ new['refname'] = refname
-+ applied_refname_map[new['refname']] = refname
-+ else:
-+ # the reference is not found in old_refs
-+ applied_refname_map[new['refname']] = new['refname']
-+
-+ self.document.note_refname(new)
-+
- for child in patch.children: # update leaves
- child.parent = node
- node.children = patch.children
-
Deleted: packages/sphinx/trunk/debian/patches/manpage_writer_docutils_0.10_api.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/manpage_writer_docutils_0.10_api.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/manpage_writer_docutils_0.10_api.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,31 +0,0 @@
-Description: port manpage writer to docutils 0.10 API
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/ffb145b7884f
-Last-Update: 2012-12-18
-
---- a/sphinx/writers/manpage.py
-+++ b/sphinx/writers/manpage.py
-@@ -72,6 +72,11 @@
- # since self.append_header() is never called, need to do this here
- self.body.append(MACRO_DEF)
-
-+ # Overwrite admonition label translations with our own
-+ for label, translation in admonitionlabels.items():
-+ self.language.labels[label] = self.deunicode(translation)
-+
-+
- # overwritten -- added quotes around all .TH arguments
- def header(self):
- tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
-@@ -193,12 +198,6 @@
- def depart_seealso(self, node):
- self.depart_admonition(node)
-
-- # overwritten -- use our own label translations
-- def visit_admonition(self, node, name=None):
-- if name:
-- self.body.append('.IP %s\n' %
-- self.deunicode(admonitionlabels.get(name, name)))
--
- def visit_productionlist(self, node):
- self.ensure_eol()
- names = []
Modified: packages/sphinx/trunk/debian/patches/parallel_2to3.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/parallel_2to3.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/parallel_2to3.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -5,10 +5,10 @@
--- a/setup.py
+++ b/setup.py
-@@ -67,6 +67,23 @@
- # The uuid module is new in the stdlib in 2.5
- requires.append('uuid>=1.30')
+@@ -155,6 +155,23 @@
+ cmdclass['compile_catalog'] = compile_catalog_plusjs
+
+if sys.version_info >= (3,):
+
+ num_processes = 1
@@ -27,5 +27,5 @@
+ )
+ lib2to3.refactor.RefactoringTool = RefactoringTool
- # Provide a "compile_catalog" command that also creates the translated
- # JavaScript files if Babel is available.
+ setup(
+ name='Sphinx',
Modified: packages/sphinx/trunk/debian/patches/pygments_byte_strings.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/pygments_byte_strings.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/pygments_byte_strings.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -9,7 +9,7 @@
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
-@@ -204,6 +204,7 @@
+@@ -210,6 +210,7 @@
try:
formatter = self.get_formatter(**kwargs)
hlsource = highlight(source, lexer, formatter)
Modified: packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -7,17 +7,21 @@
--- a/tests/run.py
+++ b/tests/run.py
-@@ -14,11 +14,11 @@
- from os import path, chdir, listdir
+@@ -14,7 +14,7 @@
+ from os import path, chdir, listdir, environ
if sys.version_info >= (3, 0):
- print('Copying and converting sources to build/lib/tests...')
+ print('Copying and converting sources to build/py3/tests...')
from distutils.util import copydir_run_2to3
testroot = path.dirname(__file__) or '.'
- newroot = path.join(testroot, path.pardir, 'build')
-- newroot = path.join(newroot, listdir(newroot)[0], 'tests')
-+ newroot = path.join(newroot, 'py3', 'tests')
+ if 'BUILD_TEST_PATH' in environ:
+@@ -23,7 +23,7 @@
+ # tox installs the sphinx package, no need for sys.path.insert
+ else:
+ newroot = path.join(testroot, path.pardir, 'build')
+- newroot = path.join(newroot, listdir(newroot)[0], 'tests')
++ newroot = path.join(newroot, 'py3', 'tests')
+ # always test the sphinx package from build/lib/
+ sys.path.insert(0, path.abspath(path.join(newroot, path.pardir)))
copydir_run_2to3(testroot, newroot)
- # switch to the converted dir so nose tests the right tests
- chdir(newroot)
Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/series 2013-04-07 23:27:46 UTC (rev 23873)
@@ -5,12 +5,5 @@
sphinxcontrib_namespace.diff
python3_test_build_dir.diff
skiptest_latex.diff
-fix_nepali_po.diff
pygments_byte_strings.diff
-fix_shorthandoff.diff
-test_build_html_rb.diff
-sort_stopwords.diff
-support_python_3.3.diff
-l10n_fixes.diff
-manpage_writer_docutils_0.10_api.diff
parallel_2to3.diff
Modified: packages/sphinx/trunk/debian/patches/show_more_stack_frames.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/show_more_stack_frames.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/show_more_stack_frames.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -13,7 +13,7 @@
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
-@@ -212,7 +212,7 @@
+@@ -268,7 +268,7 @@
print >>error, terminal_safe(unicode(err))
else:
print >>error, red('Exception occurred:')
Modified: packages/sphinx/trunk/debian/patches/skiptest_latex.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/skiptest_latex.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/skiptest_latex.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -16,7 +16,7 @@
from test_build_html import ENV_WARNINGS
-@@ -68,17 +69,17 @@
+@@ -69,17 +70,17 @@
return True
if kpsetest('article.sty') is None:
Deleted: packages/sphinx/trunk/debian/patches/sort_stopwords.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/sort_stopwords.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/sort_stopwords.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,16 +0,0 @@
-Description: sort stopwords in searchtools.js
- The order of stopwords in searchtools.js would be random if hash randomization
- was enabled, breaking dh_sphinxdoc. This patch makes the order deterministic.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: yes, https://bitbucket.org/birkenfeld/sphinx/commits/6cf5320e65
-Last-Update: 2012-12-08
-
---- a/sphinx/search/__init__.py
-+++ b/sphinx/search/__init__.py
-@@ -283,5 +283,5 @@
- def context_for_searchtool(self):
- return dict(
- search_language_stemming_code = self.lang.js_stemmer_code,
-- search_language_stop_words = jsdump.dumps(self.lang.stopwords),
-+ search_language_stop_words = jsdump.dumps(sorted(self.lang.stopwords)),
- )
Deleted: packages/sphinx/trunk/debian/patches/support_python_3.3.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/support_python_3.3.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/support_python_3.3.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,63 +0,0 @@
-Description: fix compatibility with Python 3.3
-Author: Takayuki Shimizukawa <shimizukawa at gmail.com>
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1008/test-failures-with-python-33
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1070336
-Last-Update: 2012-11-08
-
---- a/sphinx/ext/autodoc.py
-+++ b/sphinx/ext/autodoc.py
-@@ -1098,7 +1098,7 @@
- """
- objtype = 'method'
- member_order = 50
-- priority = 0
-+ priority = 1 # must be more than FunctionDocumenter
-
- @classmethod
- def can_document_member(cls, member, membername, isattr, parent):
---- a/sphinx/ext/intersphinx.py
-+++ b/sphinx/ext/intersphinx.py
-@@ -188,7 +188,17 @@
- if update:
- env.intersphinx_inventory = {}
- env.intersphinx_named_inventory = {}
-- for name, _, invdata in cache.itervalues():
-+ # Duplicate values in different inventories will shadow each
-+ # other; which one will override which can vary between builds
-+ # since they are specified using an unordered dict. To make
-+ # it more consistent, we sort the named inventories and then
-+ # add the unnamed inventories last. This means that the
-+ # unnamed inventories will shadow the named ones but the named
-+ # ones can still be accessed when the name is specified.
-+ cached_vals = list(cache.itervalues())
-+ named_vals = sorted(v for v in cached_vals if v[0])
-+ unnamed_vals = [v for v in cached_vals if not v[0]]
-+ for name, _, invdata in named_vals + unnamed_vals:
- if name:
- env.intersphinx_named_inventory[name] = invdata
- for type, objects in invdata.iteritems():
---- a/sphinx/util/__init__.py
-+++ b/sphinx/util/__init__.py
-@@ -197,13 +197,18 @@
- except Exception, err:
- raise PycodeError('error importing %r' % modname, err)
- mod = sys.modules[modname]
-- if hasattr(mod, '__loader__'):
-+ filename = getattr(mod, '__file__', None)
-+ loader = getattr(mod, '__loader__', None)
-+ if loader and getattr(loader, 'get_filename', None):
-+ try:
-+ filename = loader.get_filename(modname)
-+ except Exception, err:
-+ raise PycodeError('error getting filename for %r' % filename, err)
-+ if filename is None and loader:
- try:
-- source = mod.__loader__.get_source(modname)
-+ return 'string', loader.get_source(modname)
- except Exception, err:
- raise PycodeError('error getting source for %r' % modname, err)
-- return 'string', source
-- filename = getattr(mod, '__file__', None)
- if filename is None:
- raise PycodeError('no source found for module %r' % modname)
- filename = path.normpath(path.abspath(filename))
Deleted: packages/sphinx/trunk/debian/patches/test_build_html_rb.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/test_build_html_rb.diff 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/patches/test_build_html_rb.diff 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,17 +0,0 @@
-Description: fix encoding issues in test_build_html
- test_build_html: open files that are fed to ElementTree parser in "rb"
- mode, fixing encoding issues.
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/changeset/15c9d212bbf4
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/895
-
---- a/tests/test_build_html.py
-+++ b/tests/test_build_html.py
-@@ -328,7 +328,7 @@
- for fname, paths in HTML_XPATH.iteritems():
- parser = NslessParser()
- parser.entity.update(htmlentitydefs.entitydefs)
-- fp = open(os.path.join(app.outdir, fname))
-+ fp = open(os.path.join(app.outdir, fname), 'rb')
- try:
- etree = ET.parse(fp, parser)
- finally:
Modified: packages/sphinx/trunk/debian/python-sphinx.docs
===================================================================
--- packages/sphinx/trunk/debian/python-sphinx.docs 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/python-sphinx.docs 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,2 +1,2 @@
-README
+README.rst
AUTHORS
Modified: packages/sphinx/trunk/debian/sphinx-doc.docs
===================================================================
--- packages/sphinx/trunk/debian/sphinx-doc.docs 2013-04-07 22:13:14 UTC (rev 23872)
+++ packages/sphinx/trunk/debian/sphinx-doc.docs 2013-04-07 23:27:46 UTC (rev 23873)
@@ -1,3 +1,3 @@
-README
+README.rst
AUTHORS
build/html
More information about the Python-modules-commits
mailing list