Update to 4.4.0

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

.gitignore

@@ -20,3 +20,19 @@
 /Sphinx-2.0.0b2.tar.gz
 /Sphinx-2.0.1.tar.gz
 /Sphinx-2.1.2.tar.gz
+/Sphinx-2.2.0.tar.gz
+/Sphinx-2.2.2.tar.gz
+/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

python-sphinx.spec

@@ -4,6 +4,9 @@
 # Also, we don't have all the tests requirements
 %bcond_without tests
 
+# Unset -s on python shebang to allow RPM-installed sphinx to be used
+# with user-installed modules (#1903763)
+%global py3_shebang_flags %nil
 
 # No internet in Koji
 %bcond_with internet
@@ -15,15 +18,17 @@
 %bcond_without imagemagick_tests
 %endif
 
+# During texlive updates, sometimes the latex environment is unstable
+%bcond_without latex_tests
 
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-%global     general_version 2.1.2
+%global     general_version 4.4.0
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    2%{?dist}
+Release:    1%{?dist}
 Epoch:      1
 Summary:    Python documentation generator
 
@@ -42,26 +47,12 @@ Patch1:     sphinx-test_theming.diff
 
 BuildArch:     noarch
 
-BuildRequires: python3-devel
+BuildRequires: make
-BuildRequires: python3-setuptools
+BuildRequires: python%{python3_pkgversion}-devel
-
+BuildRequires: pyproject-rpm-macros
-BuildRequires: python3-babel
-BuildRequires: python3-docutils
-BuildRequires: python3-imagesize
-BuildRequires: python3-jinja2
-BuildRequires: python3-packaging
-BuildRequires: python3-pygments
-BuildRequires: python3-requests
-BuildRequires: python3-sphinxcontrib-applehelp
-BuildRequires: python3-sphinxcontrib-devhelp
-BuildRequires: python3-sphinxcontrib-htmlhelp
-BuildRequires: python3-sphinxcontrib-jsmath
-BuildRequires: python3-sphinxcontrib-qthelp
-BuildRequires: python3-sphinxcontrib-serializinghtml
-BuildRequires: python3-sphinx-theme-alabaster
 
 %if %{with websupport}
-BuildRequires: python3-sphinxcontrib-websupport
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
 %endif
 
 # for fixes
@@ -69,13 +60,9 @@ BuildRequires: dos2unix
 
 %if %{with tests}
 # tests import _testcapi
-BuildRequires: python3-test
+BuildRequires: python%{python3_pkgversion}-test
-
-BuildRequires: python3-html5lib
-BuildRequires: python3-mock
-BuildRequires: python3-pytest
-BuildRequires: python3-snowballstemmer
 
+BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: graphviz
 BuildRequires: texinfo
@@ -84,6 +71,7 @@ BuildRequires: texinfo
 BuildRequires: ImageMagick
 %endif
 
+%if %{with latex_tests}
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latex
 BuildRequires: texlive-dvipng
@@ -114,6 +102,7 @@ BuildRequires: tex(upquote.sty)
 BuildRequires: tex(utf8x.def)
 BuildRequires: tex(wrapfig.sty)
 %endif
+%endif
 
 
 %description
@@ -145,28 +134,18 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%package -n python3-sphinx
+%package -n python%{python3_pkgversion}-sphinx
 Summary:       Python documentation generator
 
 Recommends:    graphviz
 Recommends:    ImageMagick
-%{?python_provide:%python_provide python3-sphinx}
 
 # Bundled JavaScript
-Provides:      bundled(jquery) = 3.2.1
+Provides:      bundled(jquery) = 3.5.1
 Provides:      bundled(underscore) = 1.3.1
 Provides:      bundled(css3-mediaqueries) = 1.0
 
-# Remove in F33
+%description -n python%{python3_pkgversion}-sphinx
-Obsoletes:     python-sphinx-locale < 1:2
-Provides:      python-sphinx-locale = %{epoch}:%{version}-%{release}
-Obsoletes:     python3-sphinxcontrib-napoleon < 0.3.0
-Provides:      python3-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release}
-Conflicts:     python2-Sphinx < 1:2
-Conflicts:     python2-sphinx < 1:2
-Provides:      python(Sphinx) = %{epoch}:%{version}-%{release}
-
-%description -n python3-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
 consisting of multiple reStructuredText sources), written by Georg
@@ -195,10 +174,10 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%package -n python3-sphinx-latex
+%package -n python%{python3_pkgversion}-sphinx-latex
-Summary:       LaTeX builder dependencies for python3-sphinx
+Summary:       LaTeX builder dependencies for python%{python3_pkgversion}-sphinx
 
-Requires:      python3-sphinx = %{epoch}:%{version}-%{release}
+Requires:      python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
 Requires:      texlive-dvipng
@@ -229,13 +208,10 @@ Requires:      tex(upquote.sty)
 Requires:      tex(utf8x.def)
 Requires:      tex(wrapfig.sty)
 
-%{?python_provide:%python_provide python3-sphinx-latex}
+# No files in this package, automatic provides don't work:
+%py_provides   python%{python3_pkgversion}-sphinx-latex
 
-# Remove in F33
+%description  -n python%{python3_pkgversion}-sphinx-latex
-Obsoletes:     python-sphinx-latex < 1:2
-Provides:      python-sphinx-latex = %{epoch}:%{version}-%{release}
-
-%description  -n python3-sphinx-latex
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
 consisting of multiple reStructuredText sources), written by Georg
@@ -250,7 +226,7 @@ builder.
 %package doc
 Summary:       Documentation for %{name}
 License:       BSD
-Recommends:    python3-sphinx = %{epoch}:%{version}-%{release}
+Recommends:    python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
 
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -273,13 +249,22 @@ dos2unix -k ./sphinx/themes/basic/static/jquery.js
 rm tests/test_ext_imgconverter.py
 %endif
 
+# Don't measure coverage:
+sed -i '/pytest-cov/d' setup.py
+# Not needed on recent Pythons, https://github.com/sphinx-doc/sphinx/pull/8483
+sed -i '/typed_ast/d' setup.py
+
+
+%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
@@ -288,14 +273,12 @@ popd
 
 
 %install
-%py3_install
+%pyproject_install
 
-# For backwards compatibility. Remove around Fedora 33 (with care)
+# For backwards compatibility. Remove with care, if at all
-install -d %{buildroot}%{_libexecdir}/python3-sphinx
 for i in sphinx-{apidoc,autogen,build,quickstart}; do
     ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
     ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3
-    ln -s %{_bindir}/$i %{buildroot}%{_libexecdir}/python3-sphinx/$i
 done
 
 # Clean up non-python files
@@ -349,33 +332,29 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 %if %{with tests}
 %check
-export PYTHONPATH=%{buildroot}%{python3_sitelib}
+# Currently, all linkcheck tests and test_latex_images need internet
-export PATH=%{buildroot}%{_bindir}:$PATH
+%pytest \
-
-# Currently, all linkcheck tests and test_latex_remote_images need internet
-%{__python3} -m pytest \
 %if %{without internet}
-    -k "not linkcheck and not latex_remote_images and not test_latex_images" \
+    -k "not linkcheck and not test_latex_images" \
 %endif
 ;
 %endif
 
 
-%files -n python3-sphinx -f sphinx.lang
+%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang
 %license LICENSE
 %doc AUTHORS CHANGES EXAMPLES README.rst
 %{_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/
-%{_libexecdir}/python3-sphinx/
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
 %{_mandir}/man1/sphinx-*
 
 
-%files -n python3-sphinx-latex
+%files -n python%{python3_pkgversion}-sphinx-latex
 # empty, this is a metapackage
 
 
@@ -385,6 +364,120 @@ export PATH=%{buildroot}%{_bindir}:$PATH
 
 
 %changelog
+* 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/
+- Fixes rhbz#1867294
+
+* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.1.2-1
+- Update to 3.1.2
+- Fixes rhbz#1853901
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 30 2020 Charalampos Stratakis <cstratak@redhat.com> - 1:3.1.1-1
+- Update to 3.1.1 (#1783776)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-4
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-3
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Dec 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-1
+- Update to 2.2.2 (rhbz#1743018)
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-6
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-5
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-4
+- Bootstrap for Python 3.8
+
+* Thu Aug 15 2019 Richard Shaw <hobbes1069@gmail.com> - 1:2.1.2-3
+- Rebuild for Python 3.8.
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

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-2.1.2.tar.gz) = 22696cd143b75c497c36e08b81b10981e80ad10a4f9f42a29165bfed18bacbc33dc2f477926fe795faf9918dce9d283cd1acf03f7289bd50fa93a86e7979d9f1
+SHA512 (Sphinx-4.4.0.tar.gz) = f5780a7da7a5d758b0e145ab9a7f191a9c65fd3ca4624ca3a04f0d161e3cd6c7133df53ff56e42f012687cbce0460178c2e7957974b5b929b341c98db996c640

sphinx-test_theming.diff

@@ -5,8 +5,8 @@ diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_them
          themes.append('alabaster')
  
      # test Theme class API
--    assert set(app.html_themes.keys()) == set(themes)
+-    assert set(app.registry.html_themes.keys()) == set(themes)
-+    assert set(app.html_themes.keys()) >= set(themes)
++    assert set(app.registry.html_themes.keys()) >= set(themes)
-     assert app.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
+     assert app.registry.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
-     assert app.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
+     assert app.registry.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
-     assert app.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'
+     assert app.registry.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'