diff --git a/Sphinx-1.3.5.tar.gz b/Sphinx-1.3.5.tar.gz deleted file mode 100644 index e40d331..0000000 --- a/Sphinx-1.3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7d133bb4990d010a2ad934c319b52d8a2156cb0491484f5e2a558619bc9ae04 -size 3679978 diff --git a/Sphinx-1.3.6.tar.gz b/Sphinx-1.3.6.tar.gz new file mode 100644 index 0000000..2c91f1f --- /dev/null +++ b/Sphinx-1.3.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b3be9221220af36090d139192347bb5f42b13401e4c53a4de8f5329a7a3ff8a +size 3682405 diff --git a/fix_some_testcase_error_with_pygments-2.1.1.patch b/fix_some_testcase_error_with_pygments-2.1.1.patch deleted file mode 100644 index 1d05d8d..0000000 --- a/fix_some_testcase_error_with_pygments-2.1.1.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 50f4862b069d58ade556aad90bd179206f10fdc1 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -Date: Mon, 15 Feb 2016 11:46:30 +0900 -Subject: [PATCH] Fix some testcase get error with pygments-2.1.1 - ---- - tests/test_build_html.py | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/tests/test_build_html.py b/tests/test_build_html.py -index b97d9d5..c11ad68 100644 ---- a/tests/test_build_html.py -+++ b/tests/test_build_html.py -@@ -344,12 +344,23 @@ def check_xpath(etree, fname, path, check, be_found=True): - # only check for node presence - pass - else: -+ def get_text(node): -+ if node.text is not None: -+ return node.text -+ else: -+ # Since pygments-2.1.1, empty tag is inserted at top of -+ # highlighting block -+ if len(node) == 1 and node[0].tag == 'span' and node[0].text is None: -+ return node[0].tail -+ else: -+ return '' -+ - rex = re.compile(check) - if be_found: -- if any(node.text and rex.search(node.text) for node in nodes): -+ if any(rex.search(get_text(node)) for node in nodes): - return - else: -- if all(node.text and not rex.search(node.text) for node in nodes): -+ if all(not rex.search(get_text(node)) for node in nodes): - return - - assert False, ('%r not found in any node matching ' diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 67d899f..9e20ef6 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Feb 29 16:07:44 UTC 2016 - michael@stroeder.com + +- Removed obsolete fix_some_testcase_error_with_pygments-2.1.1.patch +- update to version 1.3.6: + * #1873, #1876, #2278: Add ``page_source_suffix`` html context variable. This should be + introduced with :confval:`source_parsers` feature. Thanks for Eric Holscher. + * #2265: Fix babel is used in spite of disabling it on ``latex_elements`` + * #2295: Avoid mutating dictionary errors while enumerating members in autodoc + with Python 3 + * #2291: Fix pdflatex "Counter too large" error from footnotes inside tables of contents + * #2292: Fix some footnotes disappear from LaTeX output + * #2287: ``sphinx.transforms.Locale`` always uses rst parser. Sphinx i18n feature should + support parsers that specified source_parsers. + * #2290: Fix ``sphinx.ext.mathbase`` use of amsfonts may break user choice of math fonts + * #2324: Print a hint how to increase the recursion limit when it is hit. + * #1565, #2229: Revert new warning; the new warning will be triggered from version 1.4 on. + * #2329: Refresh environment forcely if source directory has changed. + * #2019: Fix the domain objects in search result are not escaped + ------------------------------------------------------------------- Wed Feb 17 09:10:17 UTC 2016 - toddrme2178@gmail.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index c4f1f07..42eb52a 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -17,16 +17,13 @@ Name: python-Sphinx -Version: 1.3.5 +Version: 1.3.6 Release: 0 Url: http://sphinx-doc.org Summary: Python documentation generator License: BSD-2-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz -# PATCH-FIX-UPSTREAM fix_some_testcase_error_with_pygments-2.1.1.patch - fix tests with python-Pygments 2.1.1 -# See https://github.com/sphinx-doc/sphinx/commit/50f4862b069d58ade556aad90bd179206f10fdc1 -Patch0: fix_some_testcase_error_with_pygments-2.1.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-setuptools @@ -175,7 +172,6 @@ This package contains the LaTeX components for %{name}. %prep %setup -q -n Sphinx-%{version} -%patch0 -p1 sed -i '/#\!/d' sphinx/pycode/pgen2/token.py # Fix non-excutable-script warning # Add Interpreter version suffix to entrypoints (and thus /usr/bin binaries) to