diff --git a/fix-autodoc-tests-python-3117.patch b/fix-autodoc-tests-python-3117.patch deleted file mode 100644 index dc6165c..0000000 --- a/fix-autodoc-tests-python-3117.patch +++ /dev/null @@ -1,68 +0,0 @@ -Index: sphinx-7.2.6/tests/test_ext_autodoc_configs.py -=================================================================== ---- sphinx-7.2.6.orig/tests/test_ext_autodoc_configs.py -+++ sphinx-7.2.6/tests/test_ext_autodoc_configs.py -@@ -1584,6 +1584,14 @@ def test_autodoc_typehints_format_fully_ - - @pytest.mark.sphinx('html', testroot='ext-autodoc') - def test_autodoc_default_options(app): -+ if ( -+ (3, 11, 7) <= sys.version_info < (3, 12) -+ or sys.version_info >= (3, 12, 1) -+ ): -+ list_of_weak_references = " list of weak references to the object" -+ else: -+ list_of_weak_references = " list of weak references to the object (if defined)" -+ - # no settings - actual = do_autodoc(app, 'class', 'target.enums.EnumCls') - assert ' .. py:attribute:: EnumCls.val1' not in actual -@@ -1627,7 +1635,7 @@ def test_autodoc_default_options(app): - assert ' Iterate squares of each value.' in actual - if not IS_PYPY: - assert ' .. py:attribute:: CustomIter.__weakref__' in actual -- assert ' list of weak references to the object (if defined)' in actual -+ assert list_of_weak_references in actual - - # :exclude-members: None - has no effect. Unlike :members:, - # :special-members:, etc. where None == "include all", here None means -@@ -1651,13 +1659,21 @@ def test_autodoc_default_options(app): - assert ' Iterate squares of each value.' in actual - if not IS_PYPY: - assert ' .. py:attribute:: CustomIter.__weakref__' in actual -- assert ' list of weak references to the object (if defined)' in actual -+ assert list_of_weak_references in actual - assert ' .. py:method:: CustomIter.snafucate()' in actual - assert ' Makes this snafucated.' in actual - - - @pytest.mark.sphinx('html', testroot='ext-autodoc') - def test_autodoc_default_options_with_values(app): -+ if ( -+ (3, 11, 7) <= sys.version_info < (3, 12) -+ or sys.version_info >= (3, 12, 1) -+ ): -+ list_of_weak_references = " list of weak references to the object" -+ else: -+ list_of_weak_references = " list of weak references to the object (if defined)" -+ - # with :members: - app.config.autodoc_default_options = {'members': 'val1,val2'} - actual = do_autodoc(app, 'class', 'target.enums.EnumCls') -@@ -1698,7 +1714,7 @@ def test_autodoc_default_options_with_va - assert ' Iterate squares of each value.' in actual - if not IS_PYPY: - assert ' .. py:attribute:: CustomIter.__weakref__' not in actual -- assert ' list of weak references to the object (if defined)' not in actual -+ assert list_of_weak_references not in actual - - # with :exclude-members: - app.config.autodoc_default_options = { -@@ -1722,6 +1738,6 @@ def test_autodoc_default_options_with_va - assert ' Iterate squares of each value.' in actual - if not IS_PYPY: - assert ' .. py:attribute:: CustomIter.__weakref__' not in actual -- assert ' list of weak references to the object (if defined)' not in actual -+ assert list_of_weak_references not in actual - assert ' .. py:method:: CustomIter.snafucate()' not in actual - assert ' Makes this snafucated.' not in actual diff --git a/fix-test-expectation-for-enum-rendering-on-python-3.12.3.patch b/fix-test-expectation-for-enum-rendering-on-python-3.12.3.patch deleted file mode 100644 index fd7318f..0000000 --- a/fix-test-expectation-for-enum-rendering-on-python-3.12.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: sphinx-7.2.6/tests/test_ext_autodoc.py -=================================================================== ---- sphinx-7.2.6.orig/tests/test_ext_autodoc.py -+++ sphinx-7.2.6/tests/test_ext_autodoc.py -@@ -1407,7 +1407,10 @@ def test_enum_class(app): - options = {"members": None} - actual = do_autodoc(app, 'class', 'target.enums.EnumCls', options) - -- if sys.version_info[:2] >= (3, 12): -+ if sys.version_info[:2] >= (3, 13) or sys.version_info[:3] >= (3, 12, 3): -+ args = ('(value, names=, *values, module=None, ' -+ 'qualname=None, type=None, start=1, boundary=None)') -+ elif sys.version_info[:2] >= (3, 12): - args = ('(value, names=None, *values, module=None, ' - 'qualname=None, type=None, start=1, boundary=None)') - elif sys.version_info[:2] >= (3, 11): diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 5f4d029..d4d8243 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe35e2f5e028c53385adaf4531053d3e888e3df38bed6f92787931436add5a74 -size 184850 +oid sha256:88b7db6e7166a47da32b8d19b5c28fa9e753dd733f2352a093f8e27ffc2e89a8 +size 195069 diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 8ef2987..a77cb02 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -26,12 +26,12 @@ %endif %{?sle15_python_module_pythons} Name: python-Sphinx%{psuffix} -Version: 7.2.6 +Version: 7.3.7 Release: 0 Summary: Python documentation generator License: BSD-2-Clause Group: Development/Languages/Python -URL: http://sphinx-doc.org +URL: https://www.sphinx-doc.org Source: https://files.pythonhosted.org/packages/source/s/sphinx/sphinx-%{version}.tar.gz # Provide intersphinx inventory offline, run update-intersphinx.sh # https://docs.python.org/3/objects.inv @@ -42,10 +42,6 @@ Source3: requests.inv Source4: readthedocs.inv Source5: update-intersphinx.sh Source99: python-Sphinx.keyring -# PATCH-FIX-UPSTREAM: fix-autodoc-tests-python-3117.patch gh#sphinx-doc/sphinx#11793 -Patch01: fix-autodoc-tests-python-3117.patch -# PATCH-FIX-UPSTREAM: fix-test-expectation-for-enum-rendering-on-python-3.12.3.patch gh#sphinx-doc/sphinx#12293 -Patch02: fix-test-expectation-for-enum-rendering-on-python-3.12.3.patch BuildRequires: %{python_module base} BuildRequires: %{python_module flit-core} BuildRequires: %{python_module pip} @@ -323,8 +319,8 @@ export LC_ALL="C.utf8" %if ! %{with test} %files %{python_files} -f %{python_prefix}-sphinx.lang -%license LICENSE -%doc AUTHORS CHANGES README.rst +%license LICENSE.rst +%doc CHANGES.rst README.rst %python_alternative %{_bindir}/sphinx-apidoc %python_alternative %{_bindir}/sphinx-autogen %python_alternative %{_bindir}/sphinx-build @@ -336,24 +332,21 @@ export LC_ALL="C.utf8" %dir %{python_sitelib}/sphinxcontrib %files %{python_files latex} -%license LICENSE -%doc AUTHORS +%license LICENSE.rst %{python_sitelib}/sphinx/texinputs/ %endif %if %{with test} %if 0%{?suse_version} > 1500 %files -n python-Sphinx-doc-man -%license LICENSE -%doc AUTHORS +%license LICENSE.rst %{_mandir}/man1/sphinx-all.1%{?ext_man} %{_mandir}/man1/sphinx-apidoc.1%{?ext_man} %{_mandir}/man1/sphinx-build.1%{?ext_man} %{_mandir}/man1/sphinx-quickstart.1%{?ext_man} %files -n python-Sphinx-doc-html -%license LICENSE -%doc AUTHORS +%license LICENSE.rst %dir %{_docdir}/python-Sphinx/ %{_docdir}/python-Sphinx/html/ %endif diff --git a/sphinx-7.2.6.tar.gz b/sphinx-7.2.6.tar.gz deleted file mode 100644 index d19d94c..0000000 --- a/sphinx-7.2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5 -size 7015183 diff --git a/sphinx-7.3.7.tar.gz b/sphinx-7.3.7.tar.gz new file mode 100644 index 0000000..c95e9a1 --- /dev/null +++ b/sphinx-7.3.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4a7db75ed37531c05002d56ed6948d4c42f473a36f46e1382b0bd76ca9627bc +size 7094808