rpm/python-Sphinx
SHA256
1
0
Fork 0
forked from pool/python-Sphinx
Code Pull Requests Activity

Accepting request 838296 from devel:languages:python

Browse Source 
- add sphinx-pygments-compat.patch (fix tests with newer pygments)

OBS-URL: https://build.opensuse.org/request/show/838296
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Sphinx?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2020-10-29 08:46:17 +00:00 committed by Git OBS Bridge
commit aa5d87ab77
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-Sphinx.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 28 13:45:37 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- add sphinx-pygments-compat.patch (fix tests with newer pygments)
-------------------------------------------------------------------
Tue Aug 18 14:44:04 UTC 2020 - Dirk Mueller <dmueller@suse.com>

3
python-Sphinx.spec
View File

@ -38,6 +38,8 @@ Source: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%
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 @@ This package contains the HTML documentation for Sphinx.
%prep
%setup -q -n Sphinx-%{version}
%autopatch -p1
sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line encoding

36
sphinx-pygments-compat.patch Normal file
View File

@ -0,0 +1,36 @@
From 85b24a2e88ea71edc728aff3b078d34c2f374f06 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@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