From 67bdc19f103aca62fb949ed3f4c5a50c5fe4a97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Nov 2020 22:10:07 +0100 Subject: [PATCH] Convert to pyproject macros This adds an (optional) test dependency on Cython + gcc. This removes an unused dependency on mock. Not using %{pyproject_files} because the %install section is a mess. --- python-sphinx.spec | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 7972a9d..591ae7a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -45,22 +45,7 @@ Patch1: sphinx-test_theming.diff BuildArch: noarch 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 @@ -73,11 +58,7 @@ BuildRequires: dos2unix # 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 @@ -264,13 +245,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 %{?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 @@ -279,7 +269,7 @@ popd %install -%py3_install +%pyproject_install # For backwards compatibility. Remove with care, if at all for i in sphinx-{apidoc,autogen,build,quickstart}; do @@ -353,7 +343,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/*