Don't use filelock to test this package on RHEL

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

.gitignore

@@ -25,3 +25,21 @@
 /Sphinx-3.1.1.tar.gz
 /Sphinx-3.1.2.tar.gz
 /Sphinx-3.2.1.tar.gz
+/Sphinx-3.3.1.tar.gz
+/Sphinx-3.4.3.tar.gz
+/Sphinx-3.5.2.tar.gz
+/Sphinx-3.5.3.tar.gz
+/Sphinx-3.5.4.tar.gz
+/Sphinx-4.0.2.tar.gz
+/Sphinx-4.1.2.tar.gz
+/Sphinx-4.2.0.tar.gz
+/Sphinx-4.3.0.tar.gz
+/Sphinx-4.3.1.tar.gz
+/Sphinx-4.4.0.tar.gz
+/Sphinx-4.5.0.tar.gz
+/Sphinx-5.0.2.tar.gz
+/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

python-sphinx.spec

@@ -1,83 +1,63 @@
-# 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)
+%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 3.2.1
+%global     general_version 6.2.1
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    1%{?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
+
 
 BuildArch:     noarch
 
+BuildRequires: make
 BuildRequires: python%{python3_pkgversion}-devel
-BuildRequires: python%{python3_pkgversion}-setuptools
-
-BuildRequires: python%{python3_pkgversion}-babel
-BuildRequires: python%{python3_pkgversion}-docutils
-BuildRequires: python%{python3_pkgversion}-imagesize
-BuildRequires: python%{python3_pkgversion}-jinja2
-BuildRequires: python%{python3_pkgversion}-packaging
-BuildRequires: python%{python3_pkgversion}-pygments
-BuildRequires: python%{python3_pkgversion}-requests
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-applehelp
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-jsmath
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml
-BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster
+BuildRequires: pyproject-rpm-macros
 
 %if %{with websupport}
 BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
 %endif
 
-# for fixes
-BuildRequires: dos2unix
-
 %if %{with tests}
 # tests import _testcapi
 BuildRequires: python%{python3_pkgversion}-test
 
-BuildRequires: python%{python3_pkgversion}-html5lib
-BuildRequires: python%{python3_pkgversion}-mock
-BuildRequires: python%{python3_pkgversion}-pytest
-BuildRequires: python%{python3_pkgversion}-snowballstemmer
-
+BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: graphviz
 BuildRequires: texinfo
@@ -154,21 +134,7 @@ Summary:       Python documentation generator
 
 Recommends:    graphviz
 Recommends:    ImageMagick
-%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx}
 
-# Bundled JavaScript
-Provides:      bundled(jquery) = 3.2.1
-Provides:      bundled(underscore) = 1.3.1
-Provides:      bundled(css3-mediaqueries) = 1.0
-
-# Remove in F33
-Obsoletes:     python-sphinx-locale < 1:2
-Provides:      python-sphinx-locale = %{epoch}:%{version}-%{release}
-Obsoletes:     python%{python3_pkgversion}-sphinxcontrib-napoleon < 0.3.0
-Provides:      python%{python3_pkgversion}-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release}
-Conflicts:     python2-Sphinx < 1:2
-Conflicts:     python2-sphinx < 1:2
-Provides:      python(Sphinx) = %{epoch}:%{version}-%{release}
 
 %description -n python%{python3_pkgversion}-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -233,11 +199,8 @@ Requires:      tex(upquote.sty)
 Requires:      tex(utf8x.def)
 Requires:      tex(wrapfig.sty)
 
-%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx-latex}
-
-# Remove in F33
-Obsoletes:     python-sphinx-latex < 1:2
-Provides:      python-sphinx-latex = %{epoch}:%{version}-%{release}
+# No files in this package, automatic provides don't work:
+%py_provides   python%{python3_pkgversion}-sphinx-latex
 
 %description  -n python%{python3_pkgversion}-sphinx-latex
 Sphinx is a tool that makes it easy to create intelligent and
@@ -253,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
@@ -264,35 +227,49 @@ Brandl. It was originally created to translate the new Python
 documentation, but has now been cleaned up in the hope that it will be
 useful to many other projects.
 
-This package contains documentation in reST and HTML formats.
+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}
+
 
 %build
-%py3_build
+%pyproject_wheel
 
 export PYTHONPATH=$PWD
 pushd doc
-export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py"
+export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py"
 make html SPHINXBUILD="$SPHINXBUILD"
 make man SPHINXBUILD="$SPHINXBUILD"
 rm -rf _build/html/.buildinfo
+# Those files are copied to _build/html/_images and loaded to the
+# html pages from there - we can safely remove the duplicated and unused files
+rm -rf _build/html/_static/themes _build/html/_static/tutorial
+rm -f _build/html/_static/more.png _build/html/_static/translation.svg
 mv _build/html ..
 popd
 
 
 %install
-%py3_install
+%pyproject_install
 
 # For backwards compatibility. Remove with care, if at all
 for i in sphinx-{apidoc,autogen,build,quickstart}; do
@@ -313,12 +290,6 @@ do
 done
 popd
 
-# Deliver rst files
-rm -rf doc/_build
-sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
-mv doc reST
-rm reST/make.bat
-
 # Move language files to /usr/share;
 # patch to support this incorporated in 0.6.6
 pushd %{buildroot}%{python3_sitelib}
@@ -352,9 +323,19 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 %if %{with tests}
 %check
 # 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" \
+    -k "not linkcheck and not test_latex_images and not test_build_latex_doc" \
 %endif
 ;
 %endif
@@ -366,7 +347,7 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 %{_bindir}/sphinx-*
 %{python3_sitelib}/sphinx/
 %dir %{python3_sitelib}/sphinxcontrib/
-%{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/
+%{python3_sitelib}/sphinx-%{upstream_version}.dist-info/
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
@@ -379,10 +360,146 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 %files doc
 %license LICENSE
-%doc html reST
+%doc html
 
 
 %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+
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Nov 08 2022 Karolina Surma <ksurma@redhat.com> - 1:5.3.0-1
+- Update to 5.3.0
+- Fixes rhbz#2129546
+
+* Mon Aug 15 2022 Karolina Surma <ksurma@redhat.com> - 1:5.1.1-1
+- Update to 5.1.1
+- Fixes rhbz#2110473
+- Remove reST documentation from the -doc package, ship only HTML
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 21 2022 Karolina Surma <ksurma@redhat.com> - 1:5.0.2-1
+- Update to 5.0.2
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:4.5.0-3
+- Rebuilt for Python 3.11
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:4.5.0-2
+- Bootstrap for Python 3.11
+
+* Fri Apr 01 2022 Karolina Surma <ksurma@redhat.com> - 1:4.5.0-1
+- Update to 4.5.0
+- Fixes rhbz#2068924
+
+* Tue Feb 01 2022 Karolina Surma <ksurma@redhat.com> - 1:4.4.0-1
+- Update to 4.4.0
+- Fixes rhbz#2033955
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Nov 29 2021 Karolina Surma <ksurma@redhat.com> - 1:4.3.1-1
+- Update to 4.3.1
+- Fixes rhbz#2027059
+
+* Fri Nov 19 2021 Karolina Surma <ksurma@redhat.com> - 1:4.3.0-1
+- Update to 4.3.0
+- Fixes rhbz#2022111
+
+* Fri Sep 17 2021 Karolina Surma <ksurma@redhat.com> - 1:4.2.0-1
+- Update to 4.2.0
+- Fixes rhbz#2003427
+
+* Thu Sep 16 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-3
+- Display typing objects correctly with Python 3.10 (fix FTBFS)
+- Generate correct reference to parent class if class has `_name` attribute
+- Enable previously deselected test
+
+* Wed Aug 18 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-2
+- Patch python-sphinx to work with python-pygments >=2.10
+
+* Mon Aug 02 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-1
+- Update to 4.1.2
+- Fixes rhbz#1979326
+- Backport commit to fix python-sphinx with Python 3.10-rc1
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 11 2021 Karolina Surma <ksurma@redhat.com> - 1:4.0.2-1
+- Update to 4.0.2
+- Fixes rhbz#1948279
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1:3.5.4-3
+- Rebuilt for Python 3.10
+
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1:3.5.4-2
+- Bootstrap for Python 3.10
+
+* Mon May 10 2021 Karolina Surma <ksurma@redhat.com> - 1:3.5.4-1
+- Update to 3.5.4
+- Fixes rhbz#1949477
+
+* Thu Apr 01 2021 Karolina Surma <ksurma@redhat.com> - 1:3.5.3-1
+- Update to 3.5.3
+- Fixes rhbz#1941161
+
+* Wed Mar 10 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.5.2-1
+- Update 3.5.2
+- Fixes rhbz#1928459
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 19 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.4.3-1
+- Update to 3.4.3
+- Fixes rhbz#1909494
+
+* Sat Dec 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 1:3.3.1-2
+- Unset -s from python shebang
+- Fixes: rhbz#1903763
+
+* Mon Nov 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.3.1-1
+- Update to 3.3.1
+- Fixes: rhbz#1893752
+
+* Wed Oct 14 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:3.2.1-2
+- Backport commit to fix python-sphinx with python-pygments v2.7.1
+
 * Tue Aug 18 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.2.1-1
 - Update to 3.2.1
 - Remove compatibility symbolic links from /usr/libexec/

rpminspect.yaml

@@ -0,0 +1,4 @@
+# exclude XML template (not always valid) from XML validity check:
+xml:
+    ignore:
+        - /usr/lib/python*/site-packages/sphinx/themes/basic/opensearch.xml

sources

@@ -1 +1 @@
-SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
+SHA512 (Sphinx-6.2.1.tar.gz) = 88daae1f9bacbf513c0db1e7d732104b00ac36803b82e253d14eda287b4d48cfa34d0ed90b13099748610f405dc8bdcc54c2d33002a27b970117baf93418a062

sphinx-test_theming.diff

@@ -1,12 +1,12 @@
 diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py
 --- Sphinx-1.7.6/tests/test_theming.py	2018-07-16 11:24:40.000000000 +0200
 +++ Sphinx-1.7.6_patched/tests/test_theming.py	2018-07-20 15:17:35.049263077 +0200
-@@ -31,7 +31,7 @@
+@@ -25,7 +25,7 @@
          themes.append('alabaster')
  
      # test Theme class API
--    assert set(app.html_themes.keys()) == set(themes)
-+    assert set(app.html_themes.keys()) >= set(themes)
-     assert app.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
-     assert app.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
-     assert app.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'
+-    assert set(app.registry.html_themes.keys()) == set(themes)
++    assert set(app.registry.html_themes.keys()) >= set(themes)
+     assert app.registry.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
+     assert app.registry.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
+     assert app.registry.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'