[Python-modules-commits] r25893 - in packages/sphinx/trunk/debian (8 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Wed Sep 18 10:48:22 UTC 2013
Date: Wednesday, September 18, 2013 @ 10:48:20
Author: mitya57-guest
Revision: 25893
* New upstream beta release.
- Correctly handles errors when repr()-ing objects (closes: #706581).
* Drop upstream patches.
* Refresh and rebase other patches.
Modified:
packages/sphinx/trunk/debian/changelog
packages/sphinx/trunk/debian/patches/parallel_2to3.diff
packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff
packages/sphinx/trunk/debian/patches/series
packages/sphinx/trunk/debian/patches/skiptest.diff
Deleted:
packages/sphinx/trunk/debian/patches/fix_copying_imgs_singlehtml_builder.diff
packages/sphinx/trunk/debian/patches/fix_globaltoc_and_hidden_toctree.diff
packages/sphinx/trunk/debian/patches/fix_missing_citation_target_assert.diff
Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog 2013-09-18 05:01:38 UTC (rev 25892)
+++ packages/sphinx/trunk/debian/changelog 2013-09-18 10:48:20 UTC (rev 25893)
@@ -1,5 +1,9 @@
-sphinx (1.2~b1+dfsg-3) UNRELEASED; urgency=low
+sphinx (1.2~b2+dfsg-1) UNRELEASED; urgency=low
+ * New upstream beta release.
+ - Correctly handles errors when repr()-ing objects (closes: #706581).
+ * Drop upstream patches.
+ * Refresh and rebase other patches.
* Switch debian/watch to use HTTPS.
* Add myself to Uploaders.
Deleted: packages/sphinx/trunk/debian/patches/fix_copying_imgs_singlehtml_builder.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_copying_imgs_singlehtml_builder.diff 2013-09-18 05:01:38 UTC (rev 25892)
+++ packages/sphinx/trunk/debian/patches/fix_copying_imgs_singlehtml_builder.diff 2013-09-18 10:48:20 UTC (rev 25893)
@@ -1,16 +0,0 @@
-Description: fix copying images in the singlehtml builder
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/b1773a9751e5
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1162
-Bug-Debian: http://bugs.debian.org/706563
-Last-Update: 2013-06-04
-
---- a/sphinx/builders/html.py
-+++ b/sphinx/builders/html.py
-@@ -938,6 +938,7 @@
- doctree = self.assemble_doctree()
- self.info()
- self.info(bold('writing... '), nonl=True)
-+ self.write_doc_serialized(self.config.master_doc, doctree)
- self.write_doc(self.config.master_doc, doctree)
- self.info('done')
-
Deleted: packages/sphinx/trunk/debian/patches/fix_globaltoc_and_hidden_toctree.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_globaltoc_and_hidden_toctree.diff 2013-09-18 05:01:38 UTC (rev 25892)
+++ packages/sphinx/trunk/debian/patches/fix_globaltoc_and_hidden_toctree.diff 2013-09-18 10:48:20 UTC (rev 25893)
@@ -1,39 +0,0 @@
-Description: fix combination of globaltoc and hidden toctree causing an exception
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/48a41f195c27
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1157
-Bug-Debian: http://bugs.debian.org/706586
-Last-Update: 2013-06-04
-
---- a/sphinx/environment.py
-+++ b/sphinx/environment.py
-@@ -1038,7 +1038,8 @@
- for toctreenode in doctree.traverse(addnodes.toctree):
- toctree = self.resolve_toctree(docname, builder, toctreenode,
- prune=True, **kwds)
-- toctrees.append(toctree)
-+ if toctree:
-+ toctrees.append(toctree)
- if not toctrees:
- return None
- result = toctrees[0]
---- a/tests/test_build_html.py
-+++ b/tests/test_build_html.py
-@@ -344,3 +344,18 @@
- yield check_xpath, etree, fname, path, check
-
- check_static_entries(app.builder.outdir)
-+
-+ at with_app(buildername='html', srcdir='(empty)',
-+ confoverrides={'html_sidebars': {'*': ['globaltoc.html']}},
-+ )
-+def test_html_with_globaltoc_and_hidden_toctree(app):
-+ # issue #1157: combination of 'globaltoc.html' and hidden toctree cause
-+ # exception.
-+ (app.srcdir / 'contents.rst').write_text(
-+ '\n.. toctree::'
-+ '\n'
-+ '\n.. toctree::'
-+ '\n :hidden:'
-+ '\n')
-+ app.builder.build_all()
-+
Deleted: packages/sphinx/trunk/debian/patches/fix_missing_citation_target_assert.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_missing_citation_target_assert.diff 2013-09-18 05:01:38 UTC (rev 25892)
+++ packages/sphinx/trunk/debian/patches/fix_missing_citation_target_assert.diff 2013-09-18 10:48:20 UTC (rev 25893)
@@ -1,61 +0,0 @@
-Description: fix missing citation target causing AssertionError
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/72dceb35264e
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1160
-Bug-Debian: http://bugs.debian.org/706565
-Last-Update: 2013-06-04
-
---- a/sphinx/environment.py
-+++ b/sphinx/environment.py
-@@ -1343,6 +1343,10 @@
- if not isinstance(contnode, nodes.Element):
- del node['ids'][:]
- raise
-+ elif 'ids' in node:
-+ # remove ids attribute that annotated at
-+ # transforms.CitationReference.apply.
-+ del node['ids'][:]
- # no new node found? try the missing-reference event
- if newnode is None:
- newnode = builder.app.emit_firstresult(
---- a/tests/root/footnote.txt
-+++ b/tests/root/footnote.txt
-@@ -38,3 +38,9 @@
- .. rubric:: Citations
-
- .. [bar] cite
-+
-+
-+missing target
-+--------------------
-+[missing]_ citation
-+
---- a/tests/test_build_html.py
-+++ b/tests/test_build_html.py
-@@ -49,6 +49,7 @@
-
- HTML_WARNINGS = ENV_WARNINGS + """\
- %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*'
-+None:\\d+: WARNING: citation not found: missing
- %(root)s/markup.txt:: WARNING: invalid single index entry u''
- %(root)s/markup.txt:: WARNING: invalid pair index entry u''
- %(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; '
---- a/tests/test_build_latex.py
-+++ b/tests/test_build_latex.py
-@@ -29,6 +29,7 @@
- latex_warnfile = StringIO()
-
- LATEX_WARNINGS = ENV_WARNINGS + """\
-+None:None: WARNING: citation not found: missing
- None:None: WARNING: no matching candidate for image URI u'foo.\\*'
- WARNING: invalid pair index entry u''
- WARNING: invalid pair index entry u'keyword; '
---- a/tests/test_build_texinfo.py
-+++ b/tests/test_build_texinfo.py
-@@ -29,6 +29,7 @@
- texinfo_warnfile = StringIO()
-
- TEXINFO_WARNINGS = ENV_WARNINGS + """\
-+None:None: WARNING: citation not found: missing
- None:None: WARNING: no matching candidate for image URI u'foo.\\*'
- None:None: WARNING: no matching candidate for image URI u'svgimg.\\*'
- """
Modified: packages/sphinx/trunk/debian/patches/parallel_2to3.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/parallel_2to3.diff 2013-09-18 05:01:38 UTC (rev 25892)
+++ packages/sphinx/trunk/debian/patches/parallel_2to3.diff 2013-09-18 10:48:20 UTC (rev 25893)
@@ -5,7 +5,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -155,6 +155,23 @@
+@@ -160,6 +160,23 @@
cmdclass['compile_catalog'] = compile_catalog_plusjs
Modified: packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff 2013-09-18 05:01:38 UTC (rev 25892)
+++ packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff 2013-09-18 10:48:20 UTC (rev 25893)
@@ -3,25 +3,28 @@
package uses.
Author: Jakub Wilk <jwilk at debian.org>
Forwarded: not-needed
-Last-Update: 2012-02-12
+Last-Update: 2013-09-18
--- a/tests/run.py
+++ b/tests/run.py
-@@ -14,7 +14,7 @@
- from os import path, chdir, listdir, environ
+@@ -21,17 +21,17 @@
+ # 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, 'py%d' % sys.version_info[0], 'tests')
+ shutil.rmtree(newroot, ignore_errors=True)
+
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 '.'
- 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)
+ else:
+ # just copying test directory to parallel testing
+- print('Copying sources to build/lib/tests...')
++ print('Copying sources to build/py2/tests...')
+ shutil.copytree(testroot, newroot)
+
+ # always test the sphinx package from build/lib/
Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series 2013-09-18 05:01:38 UTC (rev 25892)
+++ packages/sphinx/trunk/debian/patches/series 2013-09-18 10:48:20 UTC (rev 25893)
@@ -6,6 +6,3 @@
skiptest.diff
parallel_2to3.diff
no_external_css.diff
-fix_copying_imgs_singlehtml_builder.diff
-fix_globaltoc_and_hidden_toctree.diff
-fix_missing_citation_target_assert.diff
Modified: packages/sphinx/trunk/debian/patches/skiptest.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/skiptest.diff 2013-09-18 05:01:38 UTC (rev 25892)
+++ packages/sphinx/trunk/debian/patches/skiptest.diff 2013-09-18 10:48:20 UTC (rev 25893)
@@ -2,43 +2,11 @@
Author: Jakub Wilk <jwilk at debian.org>
Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1184
Forwarded: yes
-Last-Update: 2013-06-04
+Last-Update: 2013-09-18
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
-@@ -18,6 +18,7 @@
- from sphinx.writers.latex import LaTeXTranslator
-
- from util import *
-+from util import SkipTest
- from test_build_html import ENV_WARNINGS
-
-
-@@ -69,17 +70,17 @@
- return True
-
- if kpsetest('article.sty') is None:
-- print >>sys.stderr, \
-- 'info: not running latex, it doesn\'t seem to be installed'
-- return
-+ raise SkipTest(
-+ 'not running latex, it doesn\'t seem to be installed'
-+ )
- for filename in ['fancyhdr.sty', 'fancybox.sty', 'titlesec.sty',
- 'amsmath.sty', 'framed.sty', 'color.sty', 'fancyvrb.sty',
- 'threeparttable.sty']:
- if not kpsetest(filename):
-- print >>sys.stderr, \
-- 'info: not running latex, the %s package doesn\'t ' \
-+ raise SkipTest(
-+ 'not running latex, the %s package doesn\'t ' \
- 'seem to be installed' % filename
-- return
-+ )
-
- # now, try to run latex over it
- cwd = os.getcwd()
-@@ -89,7 +90,7 @@
+@@ -86,7 +86,7 @@
p = Popen(['pdflatex', '--interaction=nonstopmode',
'SphinxTests.tex'], stdout=PIPE, stderr=PIPE)
except OSError:
@@ -52,12 +20,12 @@
@@ -18,6 +18,7 @@
from sphinx.writers.texinfo import TexinfoTranslator
- from util import *
+ from util import with_app, test_root, remove_unicode_literals
+from util import SkipTest
from test_build_html import ENV_WARNINGS
-@@ -55,7 +56,7 @@
+@@ -56,7 +57,7 @@
p = Popen(['makeinfo', '--no-split', 'SphinxTests.texi'],
stdout=PIPE, stderr=PIPE)
except OSError:
More information about the Python-modules-commits
mailing list