[Python-modules-commits] r18703 - in packages/sphinx/trunk/debian (8 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Fri Sep 23 21:32:52 UTC 2011
Date: Friday, September 23, 2011 @ 21:32:50
Author: jwilk
Revision: 18703
New upstream release.
Modified:
packages/sphinx/trunk/debian/changelog
packages/sphinx/trunk/debian/patches/autosummary_1.0.6.patch
packages/sphinx/trunk/debian/patches/docstring_parse.diff
packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch
packages/sphinx/trunk/debian/patches/series
packages/sphinx/trunk/debian/patches/show_more_stack_frames.diff
Deleted:
packages/sphinx/trunk/debian/patches/fix_jquery_1.5_incompatibility.diff
packages/sphinx/trunk/debian/patches/fix_test_build_latex.diff
Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog 2011-09-23 21:29:23 UTC (rev 18702)
+++ packages/sphinx/trunk/debian/changelog 2011-09-23 21:32:50 UTC (rev 18703)
@@ -1,9 +1,13 @@
-sphinx (1.0.7+dfsg-3) UNRELEASED; urgency=low
+sphinx (1.0.8+dfsg-1) UNRELEASED; urgency=low
+ * New upstream release.
+ + Drop fix_jquery_1.5_incompatibility.diff, applied upstream.
+ + Drop fix_test_build_latex.diff, applied upstream.
+ + Refresh other patches.
* Export PYTHONWARNINGS=d in debian/rules to enable all warnings in Python
code.
- -- Jakub Wilk <jwilk at debian.org> Thu, 15 Sep 2011 18:48:37 +0200
+ -- Jakub Wilk <jwilk at debian.org> Fri, 23 Sep 2011 23:13:19 +0200
sphinx (1.0.7+dfsg-2) unstable; urgency=low
Modified: packages/sphinx/trunk/debian/patches/autosummary_1.0.6.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/autosummary_1.0.6.patch 2011-09-23 21:29:23 UTC (rev 18702)
+++ packages/sphinx/trunk/debian/patches/autosummary_1.0.6.patch 2011-09-23 21:32:50 UTC (rev 18703)
@@ -2,10 +2,11 @@
Bug-Debian: http://bugs.debian.org/611078
Bug: https://bitbucket.org/birkenfeld/sphinx/issue/618
Forwarded: not-needed
+Last-Update: 2011-09-23
--- a/CHANGES
+++ b/CHANGES
-@@ -1,9 +1,6 @@
+@@ -67,9 +67,6 @@
Release 1.0.7 (Jan 15, 2011)
============================
@@ -119,7 +120,7 @@
r[0][0] = nodes.emphasis(rawtext, content[0].astext(),
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
-@@ -107,7 +107,7 @@
+@@ -108,7 +108,7 @@
ensuredir(path)
try:
@@ -128,7 +129,7 @@
except ImportError, e:
warn('[autosummary] failed to import %r: %s' % (name, e))
continue
-@@ -123,7 +123,7 @@
+@@ -124,7 +124,7 @@
f = open(fn, 'w')
try:
@@ -137,16 +138,27 @@
if template_name is not None:
template = template_env.get_template(template_name)
-@@ -137,7 +137,7 @@
+@@ -136,15 +136,10 @@
+ template = template_env.get_template('autosummary/base.rst')
+
def get_members(obj, typ, include_public=[]):
- items = [
- name for name in dir(obj)
-- if get_documenter(getattr(obj, name), obj).objtype == typ
+- items = []
+- for name in dir(obj):
+- try:
+- documenter = get_documenter(safe_getattr(obj, name),
+- obj)
+- except AttributeError:
+- continue
+- if documenter.objtype == typ:
+- items.append(name)
++ items = [
++ name for name in dir(obj)
+ if get_documenter(getattr(obj, name)).objtype == typ
- ]
++ ]
public = [x for x in items
if x in include_public or not x.startswith('_')]
-@@ -211,7 +211,7 @@
+ return public, items
+@@ -217,7 +212,7 @@
See `find_autosummary_in_lines`.
"""
try:
Modified: packages/sphinx/trunk/debian/patches/docstring_parse.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/docstring_parse.diff 2011-09-23 21:29:23 UTC (rev 18702)
+++ packages/sphinx/trunk/debian/patches/docstring_parse.diff 2011-09-23 21:32:50 UTC (rev 18703)
@@ -132,7 +132,7 @@
"""
Specialized Documenter subclass for methods (normal, static and class).
"""
-@@ -1225,6 +1271,7 @@
+@@ -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)
Deleted: packages/sphinx/trunk/debian/patches/fix_jquery_1.5_incompatibility.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_jquery_1.5_incompatibility.diff 2011-09-23 21:29:23 UTC (rev 18702)
+++ packages/sphinx/trunk/debian/patches/fix_jquery_1.5_incompatibility.diff 2011-09-23 21:32:50 UTC (rev 18703)
@@ -1,18 +0,0 @@
-Description: Fix incompatibility with jQuery >= 1.5.
-Bug-Debian: http://bugs.debian.org/625208
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/682/sphinx-101-and-jquery-15-incompatibility
-Author: Georg Brandl <georg at python.org>
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/changeset/7473a3e2e009
-Last-Update: 2011-05-18
-
---- a/sphinx/themes/basic/static/searchtools.js
-+++ b/sphinx/themes/basic/static/searchtools.js
-@@ -489,7 +489,7 @@
- listItem.slideDown(5, function() {
- displayNextItem();
- });
-- });
-+ }, "text");
- } else {
- // no source available, just display title
- Search.output.append(listItem);
Deleted: packages/sphinx/trunk/debian/patches/fix_test_build_latex.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_test_build_latex.diff 2011-09-23 21:29:23 UTC (rev 18702)
+++ packages/sphinx/trunk/debian/patches/fix_test_build_latex.diff 2011-09-23 21:32:50 UTC (rev 18703)
@@ -1,16 +0,0 @@
-Description: Fix test_build_latex to not fail in a directory with special characters.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/728/test_latex-fails-in-a-directory-with
-Last-Update: 2011-07-10
-
---- a/tests/test_build_latex.py
-+++ b/tests/test_build_latex.py
-@@ -38,7 +38,7 @@
- LaTeXTranslator.ignore_missing_images = True
- app.builder.build_all()
- latex_warnings = latex_warnfile.getvalue().replace(os.sep, '/')
-- latex_warnings_exp = LATEX_WARNINGS % {'root': app.srcdir}
-+ latex_warnings_exp = LATEX_WARNINGS % {'root': re.escape(app.srcdir)}
- assert re.match(latex_warnings_exp + '$', latex_warnings), \
- 'Warnings don\'t match:\n' + \
- '--- Expected (regex):\n' + latex_warnings_exp + \
Modified: packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch 2011-09-23 21:29:23 UTC (rev 18702)
+++ packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch 2011-09-23 21:32:50 UTC (rev 18703)
@@ -6,8 +6,8 @@
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -15,7 +15,7 @@
- __version__ = '1.0.7'
- __released__ = '1.0.7' # used when Sphinx builds its own docs
+ __version__ = '1.0.8'
+ __released__ = '1.0.8' # used when Sphinx builds its own docs
-package_dir = path.abspath(path.dirname(__file__))
+package_dir = '/usr/share/sphinx/'
@@ -30,7 +30,7 @@
import nose
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
-@@ -14,6 +14,7 @@
+@@ -12,6 +12,7 @@
from os import path
from cStringIO import StringIO
@@ -38,7 +38,7 @@
from sphinx.errors import PycodeError
from sphinx.pycode import nodes
from sphinx.pycode.pgen2 import driver, token, tokenize, parse, literals
-@@ -22,7 +23,7 @@
+@@ -20,7 +21,7 @@
# load the Python grammar
@@ -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
-@@ -76,7 +77,7 @@
+@@ -77,7 +78,7 @@
sources = [os.path.join(base_path, filename) for filename in sources]
# create our own templating environment
Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series 2011-09-23 21:29:23 UTC (rev 18702)
+++ packages/sphinx/trunk/debian/patches/series 2011-09-23 21:32:50 UTC (rev 18703)
@@ -3,6 +3,4 @@
move_static_files_outside_site-packages.patch
unversioned_grammar_pickle.diff
show_more_stack_frames.diff
-fix_jquery_1.5_incompatibility.diff
docstring_parse.diff
-fix_test_build_latex.diff
Modified: packages/sphinx/trunk/debian/patches/show_more_stack_frames.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/show_more_stack_frames.diff 2011-09-23 21:29:23 UTC (rev 18702)
+++ packages/sphinx/trunk/debian/patches/show_more_stack_frames.diff 2011-09-23 21:32:50 UTC (rev 18703)
@@ -14,7 +14,7 @@
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -212,7 +212,7 @@
- print >>error, err
+ print >>error, unicode(err).encode('ascii', 'backslashreplace')
else:
print >>error, red('Exception occurred:')
- print >>error, format_exception_cut_frames().rstrip()
More information about the Python-modules-commits
mailing list