From 081a34f3afb9a360b6132fb64b37abbeb60047ba1f55b1bd38b6e6cbd46f6aa4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 28 Sep 2022 16:52:39 +0000 Subject: [PATCH] Accepting request 1006671 from home:marxin:branches:devel:languages:python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to version 5.2.2 * #10872: Restore link targets for autodoc modules to the top of content. Patch by Dominic Davis-Foster. - Update to version 5.2.1 * #10861: Always normalise the ``pycon3`` lexer to ``pycon``. * Fix using ``sphinx.ext.autosummary`` with modules containing titles in the module-level docstring. - Remove unneeded spec hunks. - Update to version 5.2.0 * #10356: Sphinx now uses declarative metadata with pyproject.toml to create packages, using PyPA’s build project as a build backend. Patch by Adam Turner. * #10286: C++, support requires clauses not just between the template parameter lists and the declaration. * #10755: linkcheck: Check the source URL of raw directives that use the url option. * #10781: Allow ref role to be used with definitions and fields. * #10717: HTML Search: Increase priority for full title and subtitle matches in search results * #10718: HTML Search: Save search result score to the HTML element for debugging * #10673: Make toctree accept ‘genindex’, ‘modindex’ and ‘search’ docnames * #6316, #10804: Add domain objects to the table of contents. Patch by Adam Turner * #6692: HTML Search: Include explicit index directive index entries in the search index and search results. Patch by Adam Turner * #10816: imgmath: Allow embedding images in HTML as base64 * #10257: C++, ensure consistent non-specialization template argument representation. * #10729: C++, fix parsing of certain non-type template parameter packs. * #10715: Revert #10520: “Fix” use of sidebar classes in agogo.css_t * #10701: Fix ValueError in the new ``deque`` based ``sphinx.ext.napolean`` iterator implementation. * #10702: Restore compatability with third-party builders. OBS-URL: https://build.opensuse.org/request/show/1006671 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=218 --- Sphinx-5.1.1.tar.gz | 3 --- Sphinx-5.1.1.tar.gz.asc | 16 ---------------- Sphinx-5.2.2.tar.gz | 3 +++ Sphinx-5.2.2.tar.gz.asc | 16 ++++++++++++++++ python-Sphinx.changes | 41 ++++++++++++++++++++++++++++++++++++++--- python-Sphinx.spec | 27 +++++++++++++-------------- python3.inv | 4 ++-- readthedocs.inv | 4 ++-- 8 files changed, 74 insertions(+), 40 deletions(-) delete mode 100644 Sphinx-5.1.1.tar.gz delete mode 100644 Sphinx-5.1.1.tar.gz.asc create mode 100644 Sphinx-5.2.2.tar.gz create mode 100644 Sphinx-5.2.2.tar.gz.asc diff --git a/Sphinx-5.1.1.tar.gz b/Sphinx-5.1.1.tar.gz deleted file mode 100644 index c7a906d..0000000 --- a/Sphinx-5.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba3224a4e206e1fbdecf98a4fae4992ef9b24b85ebf7b584bb340156eaf08d89 -size 6755784 diff --git a/Sphinx-5.1.1.tar.gz.asc b/Sphinx-5.1.1.tar.gz.asc deleted file mode 100644 index edd6a70..0000000 --- a/Sphinx-5.1.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE01SRGb1RtK/mQ+WXUsj3KmHw+1IFAmLgWykACgkQUsj3KmHw -+1I2jA//Rs2GmE9TVq+TmeR2R4mLBwy8qZz9c+XteKFZS2OfKpIy9fTOn5CPWLki -Hm4iQHcckY6cFNAW6R9eHlt+CKOSAftjXqpIOJllIrPUVLqBex5naIjy+VV4/ARQ -BM62sSa/fHQuVbDJImxLTK1a1YC1kgxq8YunUS5dgHDF4KZz9BRSad3C1Kq3Cr+V -KPsKfuG335pX5MIQYUaXNPmviYB37v0W0q0ovu5ODxMcZyCRbhyVETnjWVPtaHyL -dLqLJ2lTxW3R57t/cyun374lJ1ff/Brj+J7dByAE3T0+AKfggaH3C4/8kbXycQpR -SnrzWW0p1Dg66XYnT1uLFwPI9t2ctxIp4t3olLz8q4dRByNj4fPrizlSZMZpvfFO -v8JyKbHsJ9cQh0EdznW918cb57ugkKCTMKupzJ6oWeF8xqQjhLAby1qlc/w2VurZ -JGsADdRJuZvNZS/XsWE/undI9CSf8iW6snyh9b55ssgHP/r7z8lF5GSEhs933UP7 -29Rc0fJlyV31Hyk5QSBs39hH6Ys2Epd1LpK16wV4nsx2iJhMWpfIln1Lo/A+mZ69 -z5MOWR1EdZP9Ms8YJ/SGcZArLGFKZKbkuhwAKaBgQKN9GnR7C+hJgcARfNsM0U9d -+UKtsJEisSW1JA5C2/LLW2kd9X7EajmYTrfWrll2mWzZVtldGO8= -=Bm5U ------END PGP SIGNATURE----- diff --git a/Sphinx-5.2.2.tar.gz b/Sphinx-5.2.2.tar.gz new file mode 100644 index 0000000..6854bf8 --- /dev/null +++ b/Sphinx-5.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7225c104dc06169eb73b061582c4bc84a9594042acae6c1582564de274b7df2f +size 6718261 diff --git a/Sphinx-5.2.2.tar.gz.asc b/Sphinx-5.2.2.tar.gz.asc new file mode 100644 index 0000000..fb971c3 --- /dev/null +++ b/Sphinx-5.2.2.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE01SRGb1RtK/mQ+WXUsj3KmHw+1IFAmMzDxMACgkQUsj3KmHw ++1KxkQ/+P0vT0nH2GvfjyvNPpUi3AGqFyyNg8SeKWNj+LPWdjFFLLzzyd9hPdEJ2 +uqrO8G4cP1KSHGYG8Fru3tu2KCEseLrYv1rd12A1m8ahDl9244jqOuHkE3K/Km5b +pgAwmw60IbpR5S1HkYhw5kFQOMT9r9c2EtEXPFE7ZFi9Bvj+cAyA2v5bbgm2DTWl +WflbZf1oJ3UADOo/XspcOa5dv6MMDfBd0hkwV2JTg3j3HKNBwAtbOxG31c4NJfic +1PzhtpTW6BlYpfx9WWD47Gu2Ex7KYn/uExosE/o+vD+0Bql6RIU9BrasAYBGv626 +pLBJuiooRaJEI2uVcNk/cEoREvSRTZ6DMXJBEG/tWgsLgp0zPgJDZ1Pf/KphffNo +EFdlHnc0y8zKp6IkovnA005eWgS5AVDQr1esMtFVATNb4d1B/VX3dCj2+KOmyzAU +Q1Pp3CiAksZ+7BiHClHfa9I9QYNFhi81AZKL4lOEJI48qV0iYdeVP0XwVepaKSfY +fTWiqHkoxvX3QX3TN8CzZ9zOXxa6Ptx0H3TxlO5D6ko4PE8v7pBt9Jqz8AVr/jvb +e+4JCeY3usmX4XNDu8wncgABbdsLKasFFNcRHfc7R4Av/Et1UW3jNOM0PN7XiN5S +YW/zvQKGGebCW0lptLR97aBapXLLptXYCR/XHUtPVE7gDjMz5/Y= +=fNa/ +-----END PGP SIGNATURE----- diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 5ee7064..d760b77 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,10 +1,45 @@ +------------------------------------------------------------------- +Tue Sep 27 15:35:11 UTC 2022 - Martin Liška + +- Update to version 5.2.2 + * #10872: Restore link targets for autodoc modules to the top of content. + Patch by Dominic Davis-Foster. + +------------------------------------------------------------------- +Mon Sep 26 07:06:34 UTC 2022 - Martin Liška + +- Update to version 5.2.1 + * #10861: Always normalise the ``pycon3`` lexer to ``pycon``. + * Fix using ``sphinx.ext.autosummary`` with modules containing titles in the + module-level docstring. +- Remove unneeded spec hunks. + +------------------------------------------------------------------- +Sun Sep 25 15:24:42 UTC 2022 - Martin Liška + +- Update to version 5.2.0 + * #10356: Sphinx now uses declarative metadata with pyproject.toml to create packages, + using PyPA’s build project as a build backend. Patch by Adam Turner. + * #10286: C++, support requires clauses not just between the template parameter lists and the declaration. + * #10755: linkcheck: Check the source URL of raw directives that use the url option. + * #10781: Allow ref role to be used with definitions and fields. + * #10717: HTML Search: Increase priority for full title and subtitle matches in search results + * #10718: HTML Search: Save search result score to the HTML element for debugging + * #10673: Make toctree accept ‘genindex’, ‘modindex’ and ‘search’ docnames + * #6316, #10804: Add domain objects to the table of contents. Patch by Adam Turner + * #6692: HTML Search: Include explicit index directive index entries in the search index and search results. Patch by Adam Turner + * #10816: imgmath: Allow embedding images in HTML as base64 + * #10257: C++, ensure consistent non-specialization template argument representation. + * #10729: C++, fix parsing of certain non-type template parameter packs. + * #10715: Revert #10520: “Fix” use of sidebar classes in agogo.css_t + ------------------------------------------------------------------- Wed Jul 27 06:58:04 UTC 2022 - Martin Liška - Update to version 5.1.1 -* #10701: Fix ValueError in the new ``deque`` based ``sphinx.ext.napolean`` - iterator implementation. -* #10702: Restore compatability with third-party builders. + * #10701: Fix ValueError in the new ``deque`` based ``sphinx.ext.napolean`` + iterator implementation. + * #10702: Restore compatability with third-party builders. ------------------------------------------------------------------- Sun Jul 24 17:44:29 UTC 2022 - Martin Liška diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 669b1aa..0065551 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -16,7 +16,6 @@ # -%{?!python_module:%define python_module() python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -25,9 +24,8 @@ %define psuffix %{nil} %bcond_with test %endif -%define skip_python2 1 Name: python-Sphinx%{psuffix} -Version: 5.1.1 +Version: 5.2.2 Release: 0 Summary: Python documentation generator License: BSD-2-Clause @@ -45,9 +43,13 @@ Source4: readthedocs.inv Source5: update-intersphinx.sh Source99: python-Sphinx.keyring BuildRequires: %{python_module base} +BuildRequires: %{python_module flit} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: python3-pip # workaround for suboptimal CentOS-7 project config #!BuildIgnore: texinfo Requires: python-Babel >= 1.3 @@ -235,10 +237,8 @@ This package contains the HTML documentation for Sphinx. %setup -q -n Sphinx-%{version} %autopatch -p1 -sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line encoding - %build -%python_build +%pyproject_wheel %if %{with test} mkdir build.doc @@ -251,19 +251,17 @@ cp %{SOURCE4} doc/readthedocs.inv # Use a more recent default (currently 3.9) from the source tag instead. # The same for requests. sed -i -e "s/\((.https:..docs.python.org.3.., \)None\()\)/\1'python3.inv'\2/g" doc/conf.py -sed -i -e "s/\((.https:..docs.python-requests.org.*, \)None\()\)/\1'requests.inv'\2/g" doc/conf.py +sed -i -e "s/\((.https:..requests.readthedocs.io.*, \)None\()\)/\1'requests.inv'\2/g" doc/conf.py sed -i -e "s/\((.https:..docs.readthedocs.io.*, \)None\()\)/\1'readthedocs.inv'\2/g" doc/conf.py -$python setup.py build_sphinx -rm build/sphinx/html/.buildinfo -$python setup.py build_sphinx -b man +# rm build/sphinx/html/.buildinfo +$python -m sphinx -b man ./doc ./build.doc/man +$python -m sphinx -M html ./doc ./build.doc/html } - -mv build/sphinx/{html,man} build.doc/ %endif %install %if ! %{with test} -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/sphinx-apidoc %python_clone -a %{buildroot}%{_bindir}/sphinx-autogen @@ -325,7 +323,8 @@ export LC_ALL="C.utf8" %python_alternative %{_bindir}/sphinx-quickstart %{python_sitelib}/sphinx/ %exclude %{python_sitelib}/sphinx/texinputs/ -%{python_sitelib}/Sphinx-%{version}-py*.egg-info +%dir %{python_sitelib}/sphinx-%{version}.dist-info +%{python_sitelib}/sphinx-%{version}.dist-info/* %dir %{python_sitelib}/sphinxcontrib %files %{python_files latex} diff --git a/python3.inv b/python3.inv index 474aea2..5ab8001 100644 --- a/python3.inv +++ b/python3.inv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d31df034343f3335a8310bd4b3f138b90186f09b167bb023a5eb8f407c6de7a -size 125537 +oid sha256:17f68917f7acc8ad96a1e7db679e483f5056f72cfea2cff315b832223c4fae93 +size 125960 diff --git a/readthedocs.inv b/readthedocs.inv index 87e6e45..c261771 100644 --- a/readthedocs.inv +++ b/readthedocs.inv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:563c5c62475250c4228a382b36a5cf23818cdee5951a0eb6b1e90632beba18d6 -size 20957 +oid sha256:59004bf1d334e73cf04bfbcd96cabc1d528a0f34a7ac7c046c6ed2574769a954 +size 21611