diff --git a/Sphinx-6.1.3.tar.gz b/Sphinx-6.1.3.tar.gz deleted file mode 100644 index 338619c..0000000 --- a/Sphinx-6.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dac3b698538ffef41716cf97ba26c1c7788dba73ce6f150c1ff5b4720786dd2 -size 6663266 diff --git a/Sphinx-6.1.3.tar.gz.asc b/Sphinx-6.1.3.tar.gz.asc deleted file mode 100644 index 092f7b3..0000000 --- a/Sphinx-6.1.3.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE01SRGb1RtK/mQ+WXUsj3KmHw+1IFAmO9iyEACgkQUsj3KmHw -+1JTohAAno4zUA+LL6NCqYa9eeyV94sEpHDjae5tYzvJiTnna//29iumvIytiL8N -CHH+t15mwRXE71nR2XVG7ANo/VH2LS1yPv1Z/1VkQ6pjjWQAc1+CRPzz+qhNp+C7 -ctPvLI3M6ISwP6mllKtzsWeM6M8VC5Y6Ydkhrck8Uqfh/tglgLhiPQSc8/HbWnve -dYDXeWo2xayWIfWyfC+HK8Hcmm3uyffy0D12Zz4SGi/tk+IkfjgU44GoHZc4HK+Z -BEC4CeOPRbeBSKFchEOYioqNqvRLkDLS4taOZTZMq3bBpAkLTRsazxJENXNr8Sit -C0GI7e+7NvmL+QDyXhm6dHcSwYNDcfb8/fKM+AEz96uxI6lY8xIk2MjDnJJYyU+w -m2t3To1WpJXjRCpQWo6yK/qWRpHp0tXbU5z/J/R1KTJ3UvRIK34Q91Rty/4vtQPE -ef7yqs163W3abetNMW3qX8Yqz+zjRw1IXCLHh7Z11RWp1XOUHzT82rRB8Pje03ZX -b7CEEJVlxlIPBv+HB+GPAMz30j/S2jo8a81WdHd+HfiAcoo0OxrseKc4qXOIYQv8 -iqHyn+QfEU1l0+NqQTZP16NQQ79ecFHKBW5oBtxhnX1XmZrqkRomAeXrymkdu4bV -mtJDO8+OkUIzIRvshXn0cesNNGFl+Iy4n7oWKpvReUT+bB9p1hY= -=mspi ------END PGP SIGNATURE----- diff --git a/Sphinx-6.2.0.tar.gz b/Sphinx-6.2.0.tar.gz new file mode 100644 index 0000000..d0037ef --- /dev/null +++ b/Sphinx-6.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ef22c2941bc3d0ff080d25a797f7521fc317e857395c712ddde97a19d5bb440 +size 6679806 diff --git a/Sphinx-6.2.0.tar.gz.asc b/Sphinx-6.2.0.tar.gz.asc new file mode 100644 index 0000000..2e5de66 --- /dev/null +++ b/Sphinx-6.2.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE01SRGb1RtK/mQ+WXUsj3KmHw+1IFAmRFkDgACgkQUsj3KmHw ++1INiQ/+NWWdROax20n0MOA1WHIT8469ICiNtUQxXaX5H9YWmV1JfVxQgoXujZCu +l8VzQQsM1X4IkDwhgBRAcKacAAzvn9tWmg3yAOHG90ivfyWtJh+St/7p1FZBc3lN +8KYlfBYZEgtpX+FQn8MwXusdpf/6BpTU4rNZ0q8BAMf1/rBSJh5FTcNG0Oz8whn4 +To9rG4H9DQpa5gyn3w6yEMxASzlRQbLF+pdhlYScSqombkURrFkoQkOUDUMpBZPR +ibNop7NGlgjUo/ikf7U1gQFL39G7glMkzIWQOBeH59c0jAm7L6MXQzyJ9TfH5nUk +feieokPygecmypZ/aa3aIhonYux4A+ruXlb+FcoZKgtTekM4A8jiu4AYqyR2xdSn +xNcFDihtXABWrLgXyyLamPrITE0gYZDVgVqEdjkR5ksOR+q/SjOx2f13TDE4LPeE +3tJbEpHING8N4XPTfiDsuRi2V62sMWiCZvfIWJhrfQS8LwY5efFlrPFYGrZBGeLi +uFTCiJHWJ/eJNiAqeEINIOSlQVzSBOX8S+BEvK5vj79lX8nAcqivbVPXjoMoIcrl +InFp1dXv6LleVhjuAZdOLlVIqcN6IUWrthTB4FyNheU2sNo9yLN7IrB8RFF3CQeZ +OX7sp+mfYdp3ehRpOXZ8vdJHGbH+N0b+SBCorBIK32vkLAoAEaw= +=ypPk +-----END PGP SIGNATURE----- diff --git a/alabaster-0713-compat.patch b/alabaster-0713-compat.patch deleted file mode 100644 index e7c3c3e..0000000 --- a/alabaster-0713-compat.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0fcd3596630b26490c4ea1999634f9f057b2244b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-Fran=C3=A7ois=20B?= - <2589111+jfbu@users.noreply.github.com> -Date: Sat, 21 Jan 2023 11:10:26 +0100 -Subject: [PATCH] Update test_config.py::test_needs_sphinx for Alabaster 0.7.13 - compat - -Relates #11145 ---- - tests/test_config.py | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/test_config.py b/tests/test_config.py -index d31fae11329..b0e2112a5e2 100644 ---- a/tests/test_config.py -+++ b/tests/test_config.py -@@ -163,20 +163,20 @@ def _make_app(*args, **kw): - return _make_app - - --@mock.patch.object(sphinx, '__display_version__', '1.3.4') -+@mock.patch.object(sphinx, '__display_version__', '1.6.4') - def test_needs_sphinx(make_app_with_empty_project): - make_app = make_app_with_empty_project - # micro version -- make_app(confoverrides={'needs_sphinx': '1.3.3'}) # OK: less -- make_app(confoverrides={'needs_sphinx': '1.3.4'}) # OK: equals -+ make_app(confoverrides={'needs_sphinx': '1.6.3'}) # OK: less -+ make_app(confoverrides={'needs_sphinx': '1.6.4'}) # OK: equals - with pytest.raises(VersionRequirementError): -- make_app(confoverrides={'needs_sphinx': '1.3.5'}) # NG: greater -+ make_app(confoverrides={'needs_sphinx': '1.6.5'}) # NG: greater - - # minor version -- make_app(confoverrides={'needs_sphinx': '1.2'}) # OK: less -- make_app(confoverrides={'needs_sphinx': '1.3'}) # OK: equals -+ make_app(confoverrides={'needs_sphinx': '1.5'}) # OK: less -+ make_app(confoverrides={'needs_sphinx': '1.6'}) # OK: equals - with pytest.raises(VersionRequirementError): -- make_app(confoverrides={'needs_sphinx': '1.4'}) # NG: greater -+ make_app(confoverrides={'needs_sphinx': '1.7'}) # NG: greater - - # major version - make_app(confoverrides={'needs_sphinx': '0'}) # OK: less diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 53b534e..a7ba902 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Mon Apr 24 07:40:28 UTC 2023 - Martin Liška + +- Bump to version 6.2.0 + * Require Docutils 0.18.1 or greater. + * LaTeX: removal of some internal TeX ``\dimen`` registers (not previously + publicly documented) as per 5.1.0 code comments in ``sphinx.sty``: + ``\sphinxverbatimsep``, ``\sphinxverbatimborder``, ``\sphinxshadowsep``, + ``\sphinxshadowsize``, and ``\sphinxshadowrule``. (refs: #11105) + * Remove ``.egg`` support from pycode ``ModuleAnalyser``; Python eggs are a + now-obsolete binary distribution format + * #11089: Remove deprecated code in ``sphinx.builders.linkcheck``. + Patch by Daniel Eades + * Remove internal-only ``sphinx.locale.setlocale`` + * #11247: Deprecate the legacy ``intersphinx_mapping`` format + * ``sphinx.util.osutil.cd`` is deprecated in favour of ``contextlib.chdir``. + * #11277: :rst:dir:`autoproperty` allows the return type to be specified as + a type comment (e.g., ``# type: () -> int``). Patch by Bénédikt Tran + * #10811: Autosummary: extend ``__all__`` to imported members for template rendering + when option ``autosummary_ignore_module_all`` is set to ``False``. Patch by + Clement Pinard + * #11147: Add a ``content_offset`` parameter to ``nested_parse_with_titles()``, + allowing for correct line numbers during nested parsing. + Patch by Jeremy Maitin-Shepard + * Update to Unicode CLDR 42 + * Add a ``--jobs`` synonym for ``-j``. Patch by Hugo van Kemenade + * LaTeX: a command ``\sphinxbox`` for styling text elements with a (possibly + rounded) box, optional background color and shadow, has been added. + See :ref:`sphinxbox`. (refs: #11224) + * LaTeX: add ``\sphinxstylenotetitle``, ..., ``\sphinxstylewarningtitle``, ..., + for an extra layer of mark-up freeing up ``\sphinxstrong`` for other uses. + See :ref:`latex-macros`. (refs: #11267) + * LaTeX: :dudir:`note`, :dudir:`hint`, :dudir:`important` and :dudir:`tip` can + now each be styled as the other admonitions, i.e. possibly with a background + color, individual border widths and paddings, possibly rounded corners, and + optional shadow. See :ref:`additionalcss`. (refs: #11234) + * LaTeX: admonitions and :dudir:`topic` (and + :dudir:`contents `) directives, and not only + :rst:dir:`code-block`, support ``box-decoration-break=slice``. + * LaTeX: let rounded boxes support up to 4 distinct border-widths (refs: #11243) + * LaTeX: new options ``noteTextColor``, ``noteTeXextras`` et al. + See :ref:`additionalcss`. + * LaTeX: support elliptical corners in rounded boxes. (refs: #11254) + * #11150: Include source location in highlighting warnings, when lexing fails. + Patch by Jeremy Maitin-Shepard + * #11281: Support for :confval:`imgmath_latex` ``= 'tectonic'`` or + ``= 'xelatex'``. Patch by Dimitar Dimitrov + * #11109, #9643: Add :confval:`python_display_short_literal_types` option for + condensed rendering of ``Literal`` types. + * #11079: LaTeX: figures with align attribute may disappear and strangely impact + following lists + * #11093: LaTeX: fix "multiply-defined references" PDF build warnings when one or + more reST labels directly precede an :rst:dir:`py:module` or :rst:dir:`automodule` + directive. Patch by Bénédikt Tran (picnixz) + * #11110: LaTeX: Figures go missing from latex pdf if their files have the same + base name and they use a post transform. Patch by aaron-cooper + * LaTeX: fix potential color leak from shadow to border of rounded boxes, if + shadow color is set but border color is not + * LaTeX: fix unintended 1pt upwards vertical shift of code blocks frames + respective to contents (when using rounded corners) + * #11235: LaTeX: added ``\color`` in topic (or admonition) contents may cause color + leak to the shadow and border at a page break + * #11264: LaTeX: missing space before colon after "Voir aussi" for :rst:dir:`seealso` + directive in French + * #11268: LaTeX: longtable with left alignment breaks out of current list + indentation context in PDF. Thanks to picnixz. + * #11274: LaTeX: external links are not properly escaped for ``\sphinxupquote`` + compatibility + * #11147: Fix source file/line number info in object description content and in + other uses of ``nested_parse_with_titles``. Patch by Jeremy Maitin-Shepard. + * #11192: Restore correct parallel search index building. + Patch by Jeremy Maitin-Shepard + * Use the new Transifex ``tx`` client + * Fail testing when any Python warnings are emitted + * Migrate remaining ``unittest.TestCase`` style test functions to pytest style + * Remove tests that rely on setuptools +- Remove alabaster-0713-compat.patch upstreamed patch. +- Update intersphinx links. +- Install filelock python dependency for tests. +- Run tests parallel. + ------------------------------------------------------------------- Fri Apr 21 12:21:22 UTC 2023 - Dirk Müller diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 78f5a69..2159173 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -26,7 +26,7 @@ %endif %{?sle15_python_module_pythons} Name: python-Sphinx%{psuffix} -Version: 6.1.3 +Version: 6.2.0 Release: 0 Summary: Python documentation generator License: BSD-2-Clause @@ -43,8 +43,6 @@ Source3: requests.inv Source4: readthedocs.inv Source5: update-intersphinx.sh Source99: python-Sphinx.keyring -# PATCH-FIX-UPSTREAM: Update test_config.py::test_needs_sphinx for Alabaster 0.7.13 compat -Patch1: alabaster-0713-compat.patch BuildRequires: %{python_module base} BuildRequires: %{python_module flit-core} BuildRequires: %{python_module pip} @@ -86,7 +84,9 @@ Requires: python-importlib-metadata >= 4.4 BuildRequires: %{python_module Cython} BuildRequires: %{python_module Sphinx = %{version}} BuildRequires: %{python_module Sphinx-latex = %{version}} +BuildRequires: %{python_module filelock} BuildRequires: %{python_module html5lib} +BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} BuildRequires: %{python_module sphinxcontrib-websupport} BuildRequires: %{python_module testsuite} @@ -257,8 +257,8 @@ sed -i -e "s/\((.https:..docs.python.org.3.., \)None\()\)/\1'python3.inv'\2/g" d 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 # rm build/sphinx/html/.buildinfo -$python -m sphinx -b man ./doc ./build.doc/man -$python -m sphinx -M html ./doc ./build.doc/html +$python -m sphinx -b man -j auto ./doc ./build.doc/man +$python -m sphinx -b html -j auto ./doc ./build.doc/html } %endif @@ -314,7 +314,7 @@ mv build.doc/man/sphinx-quickstart.1 %{buildroot}%{_mandir}/man1/sphinx-quicksta export LC_ALL="C.utf8" # test_latex_images test downloading a remote image # test_signature_annotations doesn’t work -%pytest tests -k 'not (linkcheck or test_latex_images or test_signature_annotations or test_copy_images)' +%pytest tests -k 'not (linkcheck or test_latex_images or test_signature_annotations or test_copy_images)' -n auto --dist=loadfile %endif %if ! %{with test} diff --git a/python3.inv b/python3.inv index d71eb86..a547e39 100644 --- a/python3.inv +++ b/python3.inv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:491abb80a60aa3a5d2f3136bd3a17c22b49a4094c422ebdf1f4c2db56ddf13d4 -size 129792 +oid sha256:c779e2de3285b99e5ac3783b21f2fbb640f5775042b37f3e9d04143733bd6d9f +size 130053 diff --git a/readthedocs.inv b/readthedocs.inv index a7a9b70..5ce4d7f 100644 --- a/readthedocs.inv +++ b/readthedocs.inv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d927ebf1af3f979afd19248104ad1c369a4960d830c69db3edcb2d9573bc8652 -size 22098 +oid sha256:c80642b2fc5d6553a38bcc31b1f5bb12e03db66d7811ebf0227fc47f48a1a31c +size 24683 diff --git a/requests.inv b/requests.inv index ec967e3..c5451da 100644 Binary files a/requests.inv and b/requests.inv differ