Accepting request 1056250 from home:marxin:branches:devel:languages:python

- Update to version 6.1.1
  * #11091: Fix ``util.nodes.apply_source_workaround`` for ``literal_block`` nodes
    with no source information in the node or the node's parents.
  * Adopted the `Ruff`_ code linter.
    .. _Ruff: https://github.com/charliermarsh/ruff
  * #10979: gettext: Removed support for pluralisation in ``get_translation``.
    This was unused and complicated other changes to ``sphinx.locale``.
  * ``sphinx.util`` functions:
     * Renamed ``sphinx.util.typing.stringify()``
       to ``sphinx.util.typing.stringify_annotation()``
     * Moved ``sphinx.util.xmlname_checker()``
       to ``sphinx.builders.epub3._XML_NAME_PATTERN``
     Moved to ``sphinx.util.display``:
     * ``sphinx.util.status_iterator``
     * ``sphinx.util.display_chunk``
     * ``sphinx.util.SkipProgressMessage``
     * ``sphinx.util.progress_message``
     Moved to ``sphinx.util.http_date``:
     * ``sphinx.util.epoch_to_rfc1123``
     * ``sphinx.util.rfc1123_to_epoch``
     Moved to ``sphinx.util.exceptions``:
     * ``sphinx.util.save_traceback``
     * ``sphinx.util.format_exception_cut_frames``
  * Cache doctrees in the build environment during the writing phase.
  * Make all writing phase tasks support parallel execution.
  * #11072: Use PEP 604 (``X | Y``) display conventions for ``typing.Optional``
    and ``typing.Optional`` types within the Python domain and autodoc.
  * #10700: autodoc: Document ``typing.NewType()`` types as classes rather than
    'data'.
  * Cache doctrees between the reading and writing phases.

OBS-URL: https://build.opensuse.org/request/show/1056250
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=227

Sphinx-6.0.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58c140ecd9aa0abbc8ff6da48a266648eac9e5bfc8e49576efd2979bf46f5961
-size 6658981

Sphinx-6.0.0.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE01SRGb1RtK/mQ+WXUsj3KmHw+1IFAmOtrGwACgkQUsj3KmHw
-+1KeqBAAkkYG9B3MlmY75MHiPhPSYjakjHe4uuMrGFb59Tz/TCL4S/3NxZIeyd5R
-Jr0S+BJrinQ1Z8RauIGTc0xAOPEaHyjgcC02FZa+I7JSFi85Fd5QnE+pxEB/n7Q3
-hjjo0pNqMgfLklmSvy4NmZIoZ0Ra0wJEE54pnFNPs8m5W08MShUCPz2J/41Q0Q8N
-fg8yij2a+OMBTKB9zO7NZSo/MjYeTy7x0DhFCeu708kx9e6zwGvxAhbQXYWBQz6l
-Gujaa3PEvx7CWgk3wASnwIRcaZG3K3LxkjrqjF9pvMv59PUUTVnvyqeXB79QD+YJ
-ngIvXcryxcBdWuAWtW0MUIyZMItrpYvm5xdwgBDCr+ypKfcTfeXxDtTJjy8qeCCC
-bQQq6Z+pB27+/DCa+bOXC/wgaWlSER7RiiI9OOF0kpZv2w8xxFSBl6TuXrGBPhIg
-BMsC0SdIvVjq95kKmg3hujIhkiPMolOLnWD6jsenIwQEPwRGAiRF8Na+U/dal86x
-naCFTBMgT0L0uD7SThvXDgecfaBXYpLi6McdEZpGuV8SwMOEErjeerJzBQX6ughD
-AjUhncmqtFqrlQEy3IOZPRnd5zGTwM5pWkV7NW5hpxYAEaXsGu+C+9duKkDf38UG
-v+ZafcPqd4YQeZiRiqcpn/pqvJ02parN3i6nEFCyFBA0vao5Ivg=
-=vOM0
------END PGP SIGNATURE-----

Sphinx-6.1.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a8e43b5030b9870d7402fb56f5efeebb83b76d65bf1c567a89b555340e127b2
+size 6661950

Sphinx-6.1.1.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE01SRGb1RtK/mQ+WXUsj3KmHw+1IFAmO3AcYACgkQUsj3KmHw
++1KoNg//dkGlbSEgkplFmCdkQRAQ7hQC78VDXEP+oroQa4atyfSXerBtADR54hd5
+RNa+o28VEof0m3NknN/T9vLsBYWE00Mbxo/CoFMaEnL5Aw3xZtU55yEUzsr7rjrH
+eSXon+rwuRJ2gaNdjIqLpa+9yrkzGaM5KtPAfWly/38UvHym1TlR41wqhW9501U0
+Ya2jUd11zkoxBRzsuYq6zxBPigt0SFePyHtFKFSNBGBto/OcihfMK0bVYjuZ8k3T
+alYvFHtO7fIEN3Eqs/xMG7fJtIqDLG7zGcHjtd6gK4eUTwyk08iZrOvFuBYDY03Q
+foog4k6mtwa6TDPE1gT0e8cTPRK7kSRkzqV4J0XskS1php8q/UXdwZr+EhUESjmd
+BE+Cj0JcdKrH+gwpZu5zgFk3yPEzgYa97/8wr/uUhOA3hk+U2R5xbDdOZpQI+Lix
+vRrUkJb9yqWGxhyQWkdxK+FLJMUjQxYPy/wHozG2LpTGg/QqqnCok8O9yUIvtaEC
+zMtgrE4XQizu3P2dUfztcYI3TwJkD23pWc4Emlw5psZqKb6Q7lmQIcQ9n0ddfXIJ
+/oHilO2s7vjLETHMf7JKviZ8owxktFgHPkfEnB2I8vQccCDhlKNUy3trWQoKz4cw
+lERrKm7Aru6tBL7ucYGzG4RaRqbjlyRDMVfQ6ttAWA1p3TRdW0Y=
+=RKA5
+-----END PGP SIGNATURE-----

pygments-2.14.patch

@@ -1,110 +0,0 @@
-From 965768bfda2a00ba6466cdb12a7a46efdce47023 Mon Sep 17 00:00:00 2001
-From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
-Date: Sun, 1 Jan 2023 19:17:03 +0000
-Subject: [PATCH] Fix tests for Pygments 2.14
-
-Pygments 2.14 was released on 01/01/2023 [0]
-
-[0]: https://pygments.org/docs/changelog/#version-2-14-0
----
- pyproject.toml             |  2 +-
- tests/test_ext_viewcode.py | 27 +++++++++++++++++++--------
- tests/test_intl.py         | 11 +++++++++--
- 3 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 8757572f6e7..23092f302dc 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -62,7 +62,7 @@ dependencies = [
-     "sphinxcontrib-serializinghtml>=1.1.5",
-     "sphinxcontrib-qthelp",
-     "Jinja2>=3.0",
--    "Pygments>=2.12",
-+    "Pygments>=2.13",
-     "docutils>=0.18,<0.20",
-     "snowballstemmer>=2.0",
-     "babel>=2.9",
-diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py
-index 7750b8da055..6d443d1c6d7 100644
---- a/tests/test_ext_viewcode.py
-+++ b/tests/test_ext_viewcode.py
-@@ -2,6 +2,7 @@
- 
- import re
- 
-+import pygments
- import pytest
- 
- 
-@@ -31,14 +32,24 @@ def test_viewcode(app, status, warning):
- 
-     result = (app.outdir / '_modules/spam/mod1.html').read_text(encoding='utf8')
-     result = re.sub('<span class=".*?">', '<span>', result)  # filter pygments classes
--    assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
--            'href="../../index.html#spam.Class1">[docs]</a>'
--            '<span>@decorator</span>\n'
--            '<span>class</span> <span>Class1</span>'
--            '<span>(</span><span>object</span><span>):</span>\n'
--            '    <span>&quot;&quot;&quot;</span>\n'
--            '<span>    this is Class1</span>\n'
--            '<span>    &quot;&quot;&quot;</span></div>\n') in result
-+    if pygments.__version__ >= '2.14.0':
-+        assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
-+                'href="../../index.html#spam.Class1">[docs]</a>'
-+                '<span>@decorator</span>\n'
-+                '<span>class</span> <span>Class1</span>'
-+                '<span>(</span><span>object</span><span>):</span>\n'
-+                '<span>    </span><span>&quot;&quot;&quot;</span>\n'
-+                '<span>    this is Class1</span>\n'
-+                '<span>    &quot;&quot;&quot;</span></div>\n') in result
-+    else:
-+        assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
-+                'href="../../index.html#spam.Class1">[docs]</a>'
-+                '<span>@decorator</span>\n'
-+                '<span>class</span> <span>Class1</span>'
-+                '<span>(</span><span>object</span><span>):</span>\n'
-+                '    <span>&quot;&quot;&quot;</span>\n'
-+                '<span>    this is Class1</span>\n'
-+                '<span>    &quot;&quot;&quot;</span></div>\n') in result
- 
- 
- @pytest.mark.sphinx('epub', testroot='ext-viewcode')
-diff --git a/tests/test_intl.py b/tests/test_intl.py
-index efe6c9bce93..07dfe8be3f4 100644
---- a/tests/test_intl.py
-+++ b/tests/test_intl.py
-@@ -6,6 +6,7 @@
- import os
- import re
- 
-+import pygments
- import pytest
- from babel.messages import mofile, pofile
- from babel.messages.catalog import Catalog
-@@ -1104,8 +1105,11 @@ def test_additional_targets_should_not_be_translated(app):
-     expected_expr = ("""<span class="n">literal</span>"""
-                      """<span class="o">-</span>"""
-                      """<span class="n">block</span>\n"""
--                     """<span class="k">in</span> """
-+                     """<span class="k">in</span>"""
-+                     """<span class="w"> </span>"""
-                      """<span class="n">list</span>""")
-+    if pygments.__version__ < '2.14.0':
-+        expected_expr = expected_expr.replace("""<span class="w"> </span>""", ' ')
-     assert_count(expected_expr, result, 1)
- 
-     # doctest block should not be translated but be highlighted
-@@ -1179,8 +1183,11 @@ def test_additional_targets_should_be_translated(app):
-     expected_expr = ("""<span class="no">LITERAL</span>"""
-                      """<span class="o">-</span>"""
-                      """<span class="no">BLOCK</span>\n"""
--                     """<span class="no">IN</span> """
-+                     """<span class="no">IN</span>"""
-+                     """<span class="w"> </span>"""
-                      """<span class="no">LIST</span>""")
-+    if pygments.__version__ < '2.14.0':
-+        expected_expr = expected_expr.replace("""<span class="w"> </span>""", ' ')
-     assert_count(expected_expr, result, 1)
- 
-     # doctest block should not be translated but be highlighted

python-Sphinx.changes

@@ -1,3 +1,55 @@
+-------------------------------------------------------------------
+Thu Jan  5 18:09:36 UTC 2023 - Martin Liška <mliska@suse.cz>
+
+- Update to version 6.1.1
+  * #11091: Fix ``util.nodes.apply_source_workaround`` for ``literal_block`` nodes
+    with no source information in the node or the node's parents.
+  * Adopted the `Ruff`_ code linter.
+    .. _Ruff: https://github.com/charliermarsh/ruff
+  * #10979: gettext: Removed support for pluralisation in ``get_translation``.
+    This was unused and complicated other changes to ``sphinx.locale``.
+  * ``sphinx.util`` functions:
+     * Renamed ``sphinx.util.typing.stringify()``
+       to ``sphinx.util.typing.stringify_annotation()``
+     * Moved ``sphinx.util.xmlname_checker()``
+       to ``sphinx.builders.epub3._XML_NAME_PATTERN``
+
+     Moved to ``sphinx.util.display``:
+
+     * ``sphinx.util.status_iterator``
+     * ``sphinx.util.display_chunk``
+     * ``sphinx.util.SkipProgressMessage``
+     * ``sphinx.util.progress_message``
+
+     Moved to ``sphinx.util.http_date``:
+
+     * ``sphinx.util.epoch_to_rfc1123``
+     * ``sphinx.util.rfc1123_to_epoch``
+
+     Moved to ``sphinx.util.exceptions``:
+
+     * ``sphinx.util.save_traceback``
+     * ``sphinx.util.format_exception_cut_frames``
+
+  * Cache doctrees in the build environment during the writing phase.
+  * Make all writing phase tasks support parallel execution.
+  * #11072: Use PEP 604 (``X | Y``) display conventions for ``typing.Optional``
+    and ``typing.Optional`` types within the Python domain and autodoc.
+  * #10700: autodoc: Document ``typing.NewType()`` types as classes rather than
+    'data'.
+  * Cache doctrees between the reading and writing phases.
+  * #10962: HTML: Fix the multi-word key name lookup table.
+  * Fixed support for Python 3.12 alpha 3 (changes in the ``enum`` module).
+  * #11069: HTML Theme: Removed outdated "shortcut" link relation keyword.
+  * #10952: Properly terminate parallel processes on programme interuption.
+  * #10988: Speed up ``TocTree.resolve()`` through more efficient copying.
+  * #6744: LaTeX: support for seealso directive should be via an environment
+    to allow styling.
+  * #11074: LaTeX: Can't change sphinxnote to use sphinxheavybox starting with
+    5.1.0
+  * Require Pygments 2.13 or later.
+  * #10944: imgmath:  Fix resolving image paths for files in nested folders.
+
 -------------------------------------------------------------------
 Wed Jan  4 05:56:10 UTC 2023 - Martin Liška <mliska@suse.cz>
 

python-Sphinx.spec

@@ -25,7 +25,7 @@
 %bcond_with test
 %endif
 Name:           python-Sphinx%{psuffix}
-Version:        6.0.0
+Version:        6.1.1
 Release:        0
 Summary:        Python documentation generator
 License:        BSD-2-Clause
@@ -42,8 +42,6 @@ Source3:        requests.inv
 Source4:        readthedocs.inv
 Source5:        update-intersphinx.sh
 Source99:       python-Sphinx.keyring
-# PATCH-FIX-UPSTREAM pygments-2.14.patch gh#sphinx-doc/sphinx#11067
-Patch0:         pygments-2.14.patch
 BuildRequires:  %{python_module base}
 BuildRequires:  %{python_module flit-core}
 BuildRequires:  %{python_module pip}

readthedocs.inv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bed51f9e10ff55470c8e5f9a0510a40e258b2f60604b3951c1d05cd0a581fc91
+oid sha256:be7b89c70ba412f62c2e6ed1ba8f5325938363ebdf151ca95d855e829911f537
-size 22074
+size 22085