pool/python-docutils
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add sphinx-6.0.0.patch to fix tests for new version of sphinx.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=78
This commit is contained in:
Daniel Garcia 2023-01-04 13:10:58 +00:00 committed by Git OBS Bridge
parent 46b2ce6bf5
commit ff0e60d4fb
3 changed files with 197 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-docutils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 4 13:09:13 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
- Add sphinx-6.0.0.patch to fix tests for new version of sphinx.
-------------------------------------------------------------------
Wed Nov 2 12:32:50 UTC 2022 - Matej Cepl <mcepl@suse.com>

6
python-docutils.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,8 @@ License: BSD-2-Clause AND Python-2.0 AND GPL-2.0-or-later AND GPL-3.0-or-
URL: https://pypi.python.org/pypi/docutils/
Source: https://files.pythonhosted.org/packages/source/d/docutils/docutils-%{version}.tar.gz
Source99: python-docutils-rpmlintrc
# PATCH-FIX-OPENSUSE sphinx-6.0.0.patch
Patch0: sphinx-6.0.0.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
@ -62,7 +64,7 @@ such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an
easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.
%prep
%setup -q -n docutils-%{version}
%autosetup -p1 -n docutils-%{version}
# Remove useless ".py" ending from executables:
for i in tools/rst*; do mv "$i" "${i/.py}"; done
sed -i "s|'tools/\(rst.*\)\.py'|'tools/\1'|" setup.py

188
sphinx-6.0.0.patch Normal file
View File

@ -0,0 +1,188 @@
Index: docutils-0.19/test/test_parsers/test_rst/test_directives/test_code.py
===================================================================
--- docutils-0.19.orig/test/test_parsers/test_rst/test_directives/test_code.py
+++ docutils-0.19/test/test_parsers/test_rst/test_directives/test_code.py
@@ -145,28 +145,35 @@ totest['code-parsing'] = [
my_function
<inline classes="punctuation">
():
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
8 \n\
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="literal string doc">
\'\'\'Test the lexer.
<inline classes="ln">
9 \n\
<inline classes="literal string doc">
\'\'\'
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
10 \n\
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
11 \n\
+ <inline classes="whitespace">
\n\
<inline classes="comment single">
# and now for something completely different
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
12 \n\
+ <inline classes="whitespace">
\n\
<inline classes="name builtin">
print
Index: docutils-0.19/test/test_parsers/test_rst/test_directives/test_code_long.py
===================================================================
--- docutils-0.19.orig/test/test_parsers/test_rst/test_directives/test_code_long.py
+++ docutils-0.19/test/test_parsers/test_rst/test_directives/test_code_long.py
@@ -48,28 +48,35 @@ totest['code-parsing-long'] = [
my_function
<inline classes="punctuation">
():
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
8 \n\
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="literal string doc">
\'\'\'Test the lexer.
<inline classes="ln">
9 \n\
<inline classes="literal string doc">
\'\'\'
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
10 \n\
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
11 \n\
+ <inline classes="whitespace">
\n\
<inline classes="comment single">
# and now for something completely different
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
12 \n\
+ <inline classes="whitespace">
\n\
<inline classes="name builtin">
print
Index: docutils-0.19/test/test_parsers/test_rst/test_directives/test_include.py
===================================================================
--- docutils-0.19.orig/test/test_parsers/test_rst/test_directives/test_include.py
+++ docutils-0.19/test/test_parsers/test_rst/test_directives/test_include.py
@@ -1053,7 +1053,8 @@ Included code
<inline classes="generic heading">
-----------
\n\
- \n\
+ <inline classes="whitespace">
+ \n\
This file is used by \n\
<inline classes="literal string">
``test_include.py``
@@ -1083,9 +1084,11 @@ Included code
\n\
<inline classes="ln">
3 \n\
- \n\
+ <inline classes="whitespace">
+ \n\
<inline classes="ln">
4 \n\
+ <inline classes="whitespace">
This file is used by \n\
<inline classes="literal string">
``test_include.py``
@@ -1112,10 +1115,18 @@ TAB expansion with included code:
<inline classes="name variable">
`up`
.
+ <inline classes="whitespace">
+ \n\
<- leading raw tab.
- \n\
+ <inline classes="whitespace">
+ \n\
+ \n\
Newlines
+ <inline classes="whitespace">
+ \n\
are
+ <inline classes="whitespace">
+ \n\
normalized.
""" % include_literal],
["""\
@@ -1140,10 +1151,18 @@ Custom TAB expansion with included code:
<inline classes="name variable">
`up`
.
+ <inline classes="whitespace">
+ \n\
<- leading raw tab.
- \n\
+ <inline classes="whitespace">
+ \n\
+ \n\
Newlines
+ <inline classes="whitespace">
+ \n\
are
+ <inline classes="whitespace">
+ \n\
normalized.
""" % include_literal],
["""\
@@ -1168,10 +1187,18 @@ Custom TAB expansion with included code:
<inline classes="name variable">
`up`
.
+ <inline classes="whitespace">
+ \n\
\t<- leading raw tab.
- \n\
+ <inline classes="whitespace">
+ \n\
+ \n\
Newlines
+ <inline classes="whitespace">
+ \n\
are
+ <inline classes="whitespace">
+ \n\
normalized.
""" % include_literal],
["""\
@@ -1187,7 +1214,9 @@ Including includes/include14.txt
Including more/include6.txt as rst-code from includes/include14.txt:
<literal_block classes="code rst" source="%s" xml:space="preserve">
In includes/more/include6.txt
- \n\
+ <inline classes="whitespace">
+ \n\
+ \n\
<inline classes="punctuation">
..
\n\