Don't use filelock to test this package on RHEL

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -41,3 +41,5 @@
 /Sphinx-5.1.1.tar.gz
 /Sphinx-5.2.3.tar.gz
 /Sphinx-5.3.0.tar.gz
+/Sphinx-6.1.3.tar.gz
+/Sphinx-6.2.1.tar.gz

fix-tests-with-pygments-2.14.patch

@@ -1,114 +0,0 @@
-From c3bf917fcf18c5211b220a7b294b7e6012c2d510 Mon Sep 17 00:00:00 2001
-From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
-Date: Sun, 1 Jan 2023 19:17:03 +0000
-Subject: [PATCH] Fix tests for Pygments 2.14
-
-Pygments 2.14 was released on 01/01/2023 [0]
-
-[0]: https://pygments.org/docs/changelog/#version-2-14-0
-
----
- pyproject.toml             |  2 +-
- tests/test_ext_viewcode.py | 27 +++++++++++++++++++--------
- tests/test_intl.py         | 11 +++++++++--
- 3 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 0e059b5..c02ce20 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -64,7 +64,7 @@ dependencies = [
-     "sphinxcontrib-serializinghtml>=1.1.5",
-     "sphinxcontrib-qthelp",
-     "Jinja2>=3.0",
--    "Pygments>=2.12",
-+    "Pygments>=2.13",
-     "docutils>=0.14,<0.20",
-     "snowballstemmer>=2.0",
-     "babel>=2.9",
-diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py
-index 7750b8d..6d443d1 100644
---- a/tests/test_ext_viewcode.py
-+++ b/tests/test_ext_viewcode.py
-@@ -2,6 +2,7 @@
- 
- import re
- 
-+import pygments
- import pytest
- 
- 
-@@ -31,14 +32,24 @@ def test_viewcode(app, status, warning):
- 
-     result = (app.outdir / '_modules/spam/mod1.html').read_text(encoding='utf8')
-     result = re.sub('<span class=".*?">', '<span>', result)  # filter pygments classes
--    assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
--            'href="../../index.html#spam.Class1">[docs]</a>'
--            '<span>@decorator</span>\n'
--            '<span>class</span> <span>Class1</span>'
--            '<span>(</span><span>object</span><span>):</span>\n'
--            '    <span>&quot;&quot;&quot;</span>\n'
--            '<span>    this is Class1</span>\n'
--            '<span>    &quot;&quot;&quot;</span></div>\n') in result
-+    if pygments.__version__ >= '2.14.0':
-+        assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
-+                'href="../../index.html#spam.Class1">[docs]</a>'
-+                '<span>@decorator</span>\n'
-+                '<span>class</span> <span>Class1</span>'
-+                '<span>(</span><span>object</span><span>):</span>\n'
-+                '<span>    </span><span>&quot;&quot;&quot;</span>\n'
-+                '<span>    this is Class1</span>\n'
-+                '<span>    &quot;&quot;&quot;</span></div>\n') in result
-+    else:
-+        assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
-+                'href="../../index.html#spam.Class1">[docs]</a>'
-+                '<span>@decorator</span>\n'
-+                '<span>class</span> <span>Class1</span>'
-+                '<span>(</span><span>object</span><span>):</span>\n'
-+                '    <span>&quot;&quot;&quot;</span>\n'
-+                '<span>    this is Class1</span>\n'
-+                '<span>    &quot;&quot;&quot;</span></div>\n') in result
- 
- 
- @pytest.mark.sphinx('epub', testroot='ext-viewcode')
-diff --git a/tests/test_intl.py b/tests/test_intl.py
-index 796d95b..0c4b838 100644
---- a/tests/test_intl.py
-+++ b/tests/test_intl.py
-@@ -6,6 +6,7 @@ Runs the text builder in the test root.
- import os
- import re
- 
-+import pygments
- import docutils
- import pytest
- from babel.messages import mofile, pofile
-@@ -1105,8 +1106,11 @@ def test_additional_targets_should_not_be_translated(app):
-     expected_expr = ("""<span class="n">literal</span>"""
-                      """<span class="o">-</span>"""
-                      """<span class="n">block</span>\n"""
--                     """<span class="k">in</span> """
-+                     """<span class="k">in</span>"""
-+                     """<span class="w"> </span>"""
-                      """<span class="n">list</span>""")
-+    if pygments.__version__ < '2.14.0':
-+        expected_expr = expected_expr.replace("""<span class="w"> </span>""", ' ')
-     assert_count(expected_expr, result, 1)
- 
-     # doctest block should not be translated but be highlighted
-@@ -1184,8 +1188,11 @@ def test_additional_targets_should_be_translated(app):
-     expected_expr = ("""<span class="no">LITERAL</span>"""
-                      """<span class="o">-</span>"""
-                      """<span class="no">BLOCK</span>\n"""
--                     """<span class="no">IN</span> """
-+                     """<span class="no">IN</span>"""
-+                     """<span class="w"> </span>"""
-                      """<span class="no">LIST</span>""")
-+    if pygments.__version__ < '2.14.0':
-+        expected_expr = expected_expr.replace("""<span class="w"> </span>""", ' ')
-     assert_count(expected_expr, result, 1)
- 
-     # doctest block should not be translated but be highlighted
--- 
-2.39.1
-

python-sphinx.spec

@@ -1,54 +1,47 @@
-# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport
+# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-websupport
 # Without it we have warnings in docs, but it's not a hard dependency
-%bcond_without websupport
+# We don't want to support sphinxcontrib-websupport in RHEL, hence disabling the dependency
+%bcond websupport %{undefined rhel}
 # Also, we don't have all the tests requirements
-%bcond_without tests
+%bcond tests 1
 
 # Unset -s on python shebang to allow RPM-installed sphinx to be used
 # with user-installed modules (#1903763)
-%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//)
+%undefine _py3_shebang_s
 
 # No internet in Koji
-%bcond_with internet
+%bcond internet 0
 
-%if 0%{?rhel} > 7
 # Build without BuildRequires ImageMagick, to skip imgconverter tests
-%bcond_with imagemagick_tests
-%else
-%bcond_without imagemagick_tests
-%endif
+%bcond imagemagick_tests %{undefined rhel}
+# Same for filelock -- we don't want it in RHEL just to run a handful of tests here
+%bcond filelock_tests %{undefined rhel}
 
 # During texlive updates, sometimes the latex environment is unstable
-%bcond_without latex_tests
+%bcond latex_tests 1
 
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-%global     general_version 5.3.0
+%global     general_version 6.2.1
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    3%{?dist}
+Release:    4%{?dist}
 Epoch:      1
 Summary:    Python documentation generator
 
-# Unless otherwise noted, the license for code is BSD
-# sphinx/util/inspect.py has bits licensed with PSF license v2 (Python)
+# Unless otherwise noted, the license for code is BSD-2-Clause
 # sphinx/themes/haiku/static/haiku.css_t has bits licensed with MIT
-# JS: JQuery, Underscore, css3-mediaqueries are available under MIT
-License:    BSD and Python and MIT
+License:    BSD-2-Clause AND MIT
 
 URL:        https://www.sphinx-doc.org/
-Source0:    %{pypi_source %{upstream_name} %{upstream_version}}
+Source:     %{pypi_source %{upstream_name} %{upstream_version}}
 
 # Allow extra themes to exist. We pull in python3-sphinx-theme-alabaster
 # which causes that test to fail.
-Patch1:     sphinx-test_theming.diff
+Patch:      sphinx-test_theming.diff
 
-# Backported upstream commit included in Sphinx 6+ ensures compatibility
-# with python-pygments 2.14+
-# https://github.com/sphinx-doc/sphinx/commit/965768bfda2a00ba6
-Patch2:     fix-tests-with-pygments-2.14.patch
 
 BuildArch:     noarch
 
@@ -60,9 +53,6 @@ BuildRequires: pyproject-rpm-macros
 BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
 %endif
 
-# for fixes
-BuildRequires: dos2unix
-
 %if %{with tests}
 # tests import _testcapi
 BuildRequires: python%{python3_pkgversion}-test
@@ -145,10 +135,6 @@ Summary:       Python documentation generator
 Recommends:    graphviz
 Recommends:    ImageMagick
 
-# Bundled JavaScript
-Provides:      bundled(jquery) = 3.5.1
-Provides:      bundled(underscore) = 1.3.1
-Provides:      bundled(css3-mediaqueries) = 1.0
 
 %description -n python%{python3_pkgversion}-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -230,7 +216,7 @@ builder.
 
 %package doc
 Summary:       Documentation for %{name}
-License:       BSD
+License:       BSD-2-Clause
 Recommends:    python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
 
 %description doc
@@ -247,13 +233,19 @@ This package contains documentation in the HTML format.
 %prep
 %autosetup -n %{upstream_name}-%{upstream_version} -p1
 
-# fix line encoding of bundled jquery.js
-dos2unix -k ./sphinx/themes/basic/static/jquery.js
-
 %if %{without imagemagick_tests}
 rm tests/test_ext_imgconverter.py
 %endif
 
+%if %{without filelock_tests}
+sed -i '/filelock/d' pyproject.toml
+rm tests/test_build_linkcheck.py tests/test_ext_intersphinx.py
+%endif
+
+%if %{defined rhel}
+# unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182
+sed -i '/html5lib/d' pyproject.toml
+%endif
 
 %generate_buildrequires
 %pyproject_buildrequires -r %{?with_tests:-x test}
@@ -333,7 +325,15 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 # Currently, all linkcheck tests and test_latex_images need internet
 # test_build_latex_doc needs internet to download pictures,
 # but fails also with it enabled, we decided to skip it entirely
+# In RHEL builds, skip tests which use html5lib (excluded above)
 %pytest \
+%if %{defined rhel}
+    --ignore tests/test_build_html.py \
+    --ignore tests/test_build_latex.py \
+    --ignore tests/test_build_texinfo.py \
+    --ignore tests/test_domain_std.py \
+    --ignore tests/test_smartquotes.py \
+%endif
 %if %{without internet}
     -k "not linkcheck and not test_latex_images and not test_build_latex_doc" \
 %endif
@@ -364,6 +364,36 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %changelog
+* Thu Jul 27 2023 Miro Hrončok <mhroncok@redhat.com> - 1:6.2.1-4
+- Don't use filelock to test this package on RHEL
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jul 13 2023 Karolina Surma <ksurma@redhat.com> - 1:6.2.1-2
+- Don't use websupport to build documentation on RHEL
+
+* Mon Jun 26 2023 Karolina Surma <ksurma@redhat.com> - 1:6.2.1-1
+- Update to 6.2.1
+- Fixes rhbz#2188968
+
+* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 1:6.1.3-4
+- Rebuilt for Python 3.12
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1:6.1.3-3
+- Bootstrap for Python 3.12
+
+* Wed May 31 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1:6.1.3-2
+- Avoid html5lib test dependency in RHEL builds
+
+* Fri Mar 10 2023 Karolina Surma <ksurma@redhat.com> - 1:6.1.3-1
+- Update to 6.1.3
+- Fixes rhbz#2135122
+
+* Thu Mar 09 2023 Karolina Surma <ksurma@redhat.com> - 1:5.3.0-4
+- Fix tests related to missing setuptools and Babel 2.12
+- Fixes rhbz#2176685
+
 * Tue Jan 31 2023 Karolina Surma <ksurma@redhat.com> - 1:5.3.0-3
 - Fix tests with python-pygments 2.14+
 

sources

@@ -1 +1 @@
-SHA512 (Sphinx-5.3.0.tar.gz) = cd2321409f7566c6333d6fc5c4eb4ed2d07490923b0c8762a31f062d9e5d86bbd9bd2c2bb3b93a00b37f31940173404dba8259de940fe402a248cf66a72cd7ae
+SHA512 (Sphinx-6.2.1.tar.gz) = 88daae1f9bacbf513c0db1e7d732104b00ac36803b82e253d14eda287b4d48cfa34d0ed90b13099748610f405dc8bdcc54c2d33002a27b970117baf93418a062