Hello community, here is the log from the commit of package python-Sphinx for openSUSE:Factory checked in at 2020-10-29 09:46:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Sphinx (Old) and /work/SRC/openSUSE:Factory/.python-Sphinx.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Sphinx" Thu Oct 29 09:46:17 2020 rev:68 rq:838296 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Sphinx/python-Sphinx.changes 2020-09-04 11:01:12.922690970 +0200 +++ /work/SRC/openSUSE:Factory/.python-Sphinx.new.3463/python-Sphinx.changes 2020-10-29 09:46:20.796057557 +0100 @@ -1,0 +2,5 @@ +Mon Sep 28 13:45:37 UTC 2020 - Dirk Mueller <dmuel...@suse.com> + +- add sphinx-pygments-compat.patch (fix tests with newer pygments) + +------------------------------------------------------------------- New: ---- sphinx-pygments-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Sphinx.spec ++++++ --- /var/tmp/diff_new_pack.kNe9g1/_old 2020-10-29 09:46:22.100058788 +0100 +++ /var/tmp/diff_new_pack.kNe9g1/_new 2020-10-29 09:46:22.100058788 +0100 @@ -38,6 +38,8 @@ Source1: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz.asc Source2: python3.inv Source99: python-Sphinx-rpmlintrc +# PATCH-FIX-UPSTREAM: https://patch-diff.githubusercontent.com/raw/sphinx-doc/sphinx/pull/8205.patch +Patch0: sphinx-pygments-compat.patch BuildRequires: %{python_module base} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -217,6 +219,7 @@ %prep %setup -q -n Sphinx-%{version} +%autopatch -p1 sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line encoding ++++++ sphinx-pygments-compat.patch ++++++ >From 85b24a2e88ea71edc728aff3b078d34c2f374f06 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA <i.tkom...@gmail.com> Date: Sun, 13 Sep 2020 09:16:32 +0900 Subject: [PATCH] Fix our test failed with pygments-2.7.0 Since pygments-2.7.0, it has changed the style of output HTML. That makes our test broken. This fixes it to pass with new pygments. --- tests/test_build_html.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/test_build_html.py b/tests/test_build_html.py index e949f11572..1efc6c14a6 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -10,8 +10,10 @@ import os import re +from distutils.version import LooseVersion from itertools import cycle, chain +import pygments import pytest from html5lib import HTMLParser @@ -1591,4 +1593,8 @@ def test_html_codeblock_linenos_style_inline(app): app.build() content = (app.outdir / 'index.html').read_text() - assert '<span class="lineno">1 </span>' in content + pygments_version = tuple(LooseVersion(pygments.__version__).version) + if pygments_version > (2, 7): + assert '<span class="linenos">1</span>' in content + else: + assert '<span class="lineno">1 </span>' in content
