From 70106d2fc6423702a3153dc585072cab7a072922 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 25 Oct 2024 18:53:07 +0300 Subject: [PATCH] import python-sphinx-7.2.6-9.el10 --- .gitignore | 1 + .python-sphinx.metadata | 1 + SOURCES/11774.patch | 69 ++ ...Fix-autodoc-tests-with-Python-3.12.3.patch | 51 + ...-the-first-party-extensions-optional.patch | 204 ++++ SOURCES/Patch-out-snowballstemmer.patch | 265 +++++ SOURCES/sphinx-test_theming.diff | 12 + SPECS/python-sphinx.spec | 1041 +++++++++++++++++ 8 files changed, 1644 insertions(+) create mode 100644 .gitignore create mode 100644 .python-sphinx.metadata create mode 100644 SOURCES/11774.patch create mode 100644 SOURCES/Fix-autodoc-tests-with-Python-3.12.3.patch create mode 100644 SOURCES/Make-the-first-party-extensions-optional.patch create mode 100644 SOURCES/Patch-out-snowballstemmer.patch create mode 100644 SOURCES/sphinx-test_theming.diff create mode 100644 SPECS/python-sphinx.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..37f4a79 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/sphinx-7.2.6.tar.gz diff --git a/.python-sphinx.metadata b/.python-sphinx.metadata new file mode 100644 index 0000000..a6e5a96 --- /dev/null +++ b/.python-sphinx.metadata @@ -0,0 +1 @@ +f7327207321395a710e8b4edbe9e585e2511e1e7 SOURCES/sphinx-7.2.6.tar.gz diff --git a/SOURCES/11774.patch b/SOURCES/11774.patch new file mode 100644 index 0000000..47370b2 --- /dev/null +++ b/SOURCES/11774.patch @@ -0,0 +1,69 @@ +From bc8939b34037f81b8610f3b26caec128ee20a2f4 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Tue, 28 Nov 2023 14:43:58 +0100 +Subject: [PATCH] Adjust the expected string to match Python 3.11+ changed + output + +--- + tests/test_ext_autodoc_configs.py | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +diff --git a/tests/test_ext_autodoc_configs.py b/tests/test_ext_autodoc_configs.py +index 45bc729b73e..0994c08e899 100644 +--- a/tests/test_ext_autodoc_configs.py ++++ b/tests/test_ext_autodoc_configs.py +@@ -11,6 +11,7 @@ + from .test_ext_autodoc import do_autodoc + + IS_PYPY = platform.python_implementation() == 'PyPy' ++IS_PY311_AND_LATER = sys.version_info >= (3, 11) + + + @contextmanager +@@ -1627,7 +1628,10 @@ 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 ++ if IS_PY311_AND_LATER: ++ assert ' list of weak references to the object' in actual ++ else: ++ assert ' list of weak references to the object (if defined)' in actual + + # :exclude-members: None - has no effect. Unlike :members:, + # :special-members:, etc. where None == "include all", here None means +@@ -1651,7 +1655,10 @@ 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 ++ if IS_PY311_AND_LATER: ++ assert ' list of weak references to the object' in actual ++ else: ++ assert ' list of weak references to the object (if defined)' in actual + assert ' .. py:method:: CustomIter.snafucate()' in actual + assert ' Makes this snafucated.' in actual + +@@ -1698,7 +1705,10 @@ def test_autodoc_default_options_with_values(app): + 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 ++ if IS_PY311_AND_LATER: ++ assert ' list of weak references to the object' not in actual ++ else: ++ assert ' list of weak references to the object (if defined)' not in actual + + # with :exclude-members: + app.config.autodoc_default_options = { +@@ -1722,6 +1732,9 @@ def test_autodoc_default_options_with_values(app): + 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 ++ if IS_PY311_AND_LATER: ++ assert ' list of weak references to the object' not in actual ++ else: ++ assert ' list of weak references to the object (if defined)' not in actual + assert ' .. py:method:: CustomIter.snafucate()' not in actual + assert ' Makes this snafucated.' not in actual diff --git a/SOURCES/Fix-autodoc-tests-with-Python-3.12.3.patch b/SOURCES/Fix-autodoc-tests-with-Python-3.12.3.patch new file mode 100644 index 0000000..4d78a38 --- /dev/null +++ b/SOURCES/Fix-autodoc-tests-with-Python-3.12.3.patch @@ -0,0 +1,51 @@ +From 22caeb2631922c3f5e3f4bb45d8c1610edb6ef74 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Thu, 22 Aug 2024 12:33:34 +0200 +Subject: [PATCH] Fix autodoc tests with Python 3.12.3+ + +--- + tests/test_ext_autodoc.py | 5 ++++- + tests/test_ext_autodoc_configs.py | 4 ++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tests/test_ext_autodoc.py b/tests/test_ext_autodoc.py +index 7062763..5f63214 100644 +--- a/tests/test_ext_autodoc.py ++++ b/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[: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/tests/test_ext_autodoc_configs.py b/tests/test_ext_autodoc_configs.py +index 0994c08..a240c4b 100644 +--- a/tests/test_ext_autodoc_configs.py ++++ b/tests/test_ext_autodoc_configs.py +@@ -1273,7 +1273,7 @@ def test_autodoc_type_aliases(app): + ' docstring', + '', + '', +- '.. py:function:: mult(x: int, y: int) -> int', ++ '.. py:function:: mult(x: myint, y: myint) -> myint', + ' mult(x: float, y: float) -> float', + ' :module: target.autodoc_type_aliases', + '', +@@ -1344,7 +1344,7 @@ def test_autodoc_type_aliases(app): + ' docstring', + '', + '', +- '.. py:function:: mult(x: myint, y: myint) -> myint', ++ '.. py:function:: mult(x: myint, y: myint) -> myint', + ' mult(x: float, y: float) -> float', + ' :module: target.autodoc_type_aliases', + '', +-- +2.46.0 + diff --git a/SOURCES/Make-the-first-party-extensions-optional.patch b/SOURCES/Make-the-first-party-extensions-optional.patch new file mode 100644 index 0000000..ad3985a --- /dev/null +++ b/SOURCES/Make-the-first-party-extensions-optional.patch @@ -0,0 +1,204 @@ +From 9699465414515f0eba76d05069e755b5bcf34eef Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Mon, 15 Jan 2024 16:19:32 +0100 +Subject: [PATCH] Make the first party extensions optional, add [extensions] + extra + + +Co-authored-by: Miro Hrončok +--- + pyproject.toml | 33 +++++++++++++++++++++++++++------ + sphinx/application.py | 6 +++--- + sphinx/registry.py | 9 ++++++--- + sphinx/testing/fixtures.py | 6 ++++++ + tests/test_api_translator.py | 2 ++ + tests/test_build_html.py | 3 +++ + 6 files changed, 47 insertions(+), 12 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 8f93701..41c28c5 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -55,12 +55,6 @@ classifiers = [ + "Topic :: Utilities", + ] + dependencies = [ +- "sphinxcontrib-applehelp", +- "sphinxcontrib-devhelp", +- "sphinxcontrib-jsmath", +- "sphinxcontrib-htmlhelp>=2.0.0", +- "sphinxcontrib-serializinghtml>=1.1.9", +- "sphinxcontrib-qthelp", + "Jinja2>=3.0", + "Pygments>=2.14", + "docutils>=0.18.1,<0.21", +@@ -76,8 +70,35 @@ dependencies = [ + dynamic = ["version"] + + [project.optional-dependencies] ++applehelp = [ ++ "sphinxcontrib-applehelp", ++] ++devhelp = [ ++ "sphinxcontrib-devhelp", ++] ++jsmath = [ ++ "sphinxcontrib-jsmath", ++] ++htmlhelp = [ ++ "sphinxcontrib-htmlhelp>=2.0.0", ++] ++serializinghtml = [ ++ "sphinxcontrib-serializinghtml>=1.1.9", ++] ++qthelp = [ ++ "sphinxcontrib-qthelp", ++] ++extensions = [ ++ "sphinx[applehelp]", ++ "sphinx[devhelp]", ++ "sphinx[jsmath]", ++ "sphinx[htmlhelp]", ++ "sphinx[serializinghtml]", ++ "sphinx[qthelp]", ++] + docs = [ + "sphinxcontrib-websupport", ++ "sphinx[extensions]", + ] + lint = [ + "flake8>=3.5.0", +diff --git a/sphinx/application.py b/sphinx/application.py +index d5fbaa9..b030dab 100644 +--- a/sphinx/application.py ++++ b/sphinx/application.py +@@ -226,7 +226,7 @@ class Sphinx: + # load all built-in extension modules, first-party extension modules, + # and first-party themes + for extension in builtin_extensions: +- self.setup_extension(extension) ++ self.setup_extension(extension, skip_nonimportable=extension in _first_party_extensions) + + # load all user-given extension modules + for extension in self.config.extensions: +@@ -395,7 +395,7 @@ class Sphinx: + + # ---- general extensibility interface ------------------------------------- + +- def setup_extension(self, extname: str) -> None: ++ def setup_extension(self, extname: str, skip_nonimportable: bool = False) -> None: + """Import and setup a Sphinx extension module. + + Load the extension given by the module *name*. Use this if your +@@ -403,7 +403,7 @@ class Sphinx: + called twice. + """ + logger.debug('[app] setting up extension: %r', extname) +- self.registry.load_extension(self, extname) ++ self.registry.load_extension(self, extname, skip_nonimportable=skip_nonimportable) + + @staticmethod + def require_sphinx(version: tuple[int, int] | str) -> None: +diff --git a/sphinx/registry.py b/sphinx/registry.py +index 501661d..96d4554 100644 +--- a/sphinx/registry.py ++++ b/sphinx/registry.py +@@ -430,7 +430,7 @@ class SphinxComponentRegistry: + def add_html_theme(self, name: str, theme_path: str) -> None: + self.html_themes[name] = theme_path + +- def load_extension(self, app: Sphinx, extname: str) -> None: ++ def load_extension(self, app: Sphinx, extname: str, skip_nonimportable: bool = False) -> None: + """Load a Sphinx extension.""" + if extname in app.extensions: # already loaded + return +@@ -446,9 +446,12 @@ class SphinxComponentRegistry: + try: + mod = import_module(extname) + except ImportError as err: ++ msg = __('Could not import extension %s') ++ if skip_nonimportable: ++ logger.debug(msg % extname) ++ return + logger.verbose(__('Original exception:\n') + traceback.format_exc()) +- raise ExtensionError(__('Could not import extension %s') % extname, +- err) from err ++ raise ExtensionError(msg % extname, err) from err + + setup = getattr(mod, 'setup', None) + if setup is None: +diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py +index 0cc4882..f57f709 100644 +--- a/sphinx/testing/fixtures.py ++++ b/sphinx/testing/fixtures.py +@@ -22,6 +22,7 @@ DEFAULT_ENABLED_MARKERS = [ + 'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None,' + ' docutilsconf=None, parallel=0): arguments to initialize the sphinx test application.' + ), ++ 'sphinxcontrib(...): required sphinxcontrib.* extensions', + 'test_params(shared_result=...): test parameters.', + ] + +@@ -67,6 +68,11 @@ def app_params(request: Any, test_params: dict, shared_result: SharedResult, + sphinx.application.Sphinx initialization + """ + ++ # ##### process pytest.mark.sphinxcontrib ++ for info in reversed(list(request.node.iter_markers("sphinxcontrib"))): ++ for arg in info.args: ++ pytest.importorskip("sphinxcontrib." + arg) ++ + # ##### process pytest.mark.sphinx + + pargs = {} +diff --git a/tests/test_api_translator.py b/tests/test_api_translator.py +index 9f2bd44..81575b7 100644 +--- a/tests/test_api_translator.py ++++ b/tests/test_api_translator.py +@@ -36,6 +36,7 @@ def test_singlehtml_set_translator_for_singlehtml(app, status, warning): + assert translator_class.__name__ == 'ConfSingleHTMLTranslator' + + ++@pytest.mark.sphinxcontrib('serializinghtml') + @pytest.mark.sphinx('pickle', testroot='api-set-translator') + def test_pickle_set_translator_for_pickle(app, status, warning): + translator_class = app.builder.get_translator_class() +@@ -43,6 +44,7 @@ def test_pickle_set_translator_for_pickle(app, status, warning): + assert translator_class.__name__ == 'ConfPickleTranslator' + + ++@pytest.mark.sphinxcontrib('serializinghtml') + @pytest.mark.sphinx('json', testroot='api-set-translator') + def test_json_set_translator_for_json(app, status, warning): + translator_class = app.builder.get_translator_class() +diff --git a/tests/test_build_html.py b/tests/test_build_html.py +index 07f101d..c512a33 100644 +--- a/tests/test_build_html.py ++++ b/tests/test_build_html.py +@@ -1544,6 +1544,7 @@ def test_html_math_renderer_is_imgmath(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' + + ++@pytest.mark.sphinxcontrib('serializinghtml', 'jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.imgmath']}) +@@ -1564,6 +1565,7 @@ def test_html_math_renderer_is_duplicated2(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' # The another one is chosen + + ++@pytest.mark.sphinxcontrib('jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.imgmath'], +@@ -1572,6 +1574,7 @@ def test_html_math_renderer_is_chosen(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' + + ++@pytest.mark.sphinxcontrib('jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.mathjax'], +-- +2.43.0 + diff --git a/SOURCES/Patch-out-snowballstemmer.patch b/SOURCES/Patch-out-snowballstemmer.patch new file mode 100644 index 0000000..d4b3b52 --- /dev/null +++ b/SOURCES/Patch-out-snowballstemmer.patch @@ -0,0 +1,265 @@ +From ec721111162a24a960b8c725340e183f970d4a1c Mon Sep 17 00:00:00 2001 +From: Lumir Balhar +Date: Mon, 10 Jun 2024 16:53:08 +0200 +Subject: [PATCH] Patch-out snowballstemmer and replace it with a dummy + implementation + +--- + pyproject.toml | 1 - + sphinx/search/da.py | 2 +- + sphinx/search/de.py | 2 +- + sphinx/search/dummystemmer.py | 8 ++++++++ + sphinx/search/en.py | 2 +- + sphinx/search/es.py | 2 +- + sphinx/search/fi.py | 2 +- + sphinx/search/fr.py | 2 +- + sphinx/search/hu.py | 2 +- + sphinx/search/it.py | 2 +- + sphinx/search/nl.py | 2 +- + sphinx/search/no.py | 2 +- + sphinx/search/pt.py | 2 +- + sphinx/search/ro.py | 2 +- + sphinx/search/ru.py | 2 +- + sphinx/search/sv.py | 2 +- + sphinx/search/tr.py | 2 +- + sphinx/search/zh.py | 2 +- + 18 files changed, 24 insertions(+), 17 deletions(-) + create mode 100644 sphinx/search/dummystemmer.py + +diff --git a/pyproject.toml b/pyproject.toml +index 0d19435..32cf5bf 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -58,7 +58,6 @@ dependencies = [ + "Jinja2>=3.0", + "Pygments>=2.14", + "docutils>=0.18.1,<0.21", +- "snowballstemmer>=2.0", + "babel>=2.9", + "alabaster>=0.7,<0.8", + "imagesize>=1.3", +diff --git a/sphinx/search/da.py b/sphinx/search/da.py +index 9b5b9f5..0ff9a56 100644 +--- a/sphinx/search/da.py ++++ b/sphinx/search/da.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/de.py b/sphinx/search/de.py +index 1c253fd..76af961 100644 +--- a/sphinx/search/de.py ++++ b/sphinx/search/de.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/dummystemmer.py b/sphinx/search/dummystemmer.py +new file mode 100644 +index 0000000..46f8fb7 +--- /dev/null ++++ b/sphinx/search/dummystemmer.py +@@ -0,0 +1,8 @@ ++# Dummy stemmer implementation doing nothing ++ ++class stemmer: ++ def __init__(self, *args, **kwargs): ++ pass ++ ++ def stemWord(self, word): ++ return word +diff --git a/sphinx/search/en.py b/sphinx/search/en.py +index caa6f66..1e3fbb8 100644 +--- a/sphinx/search/en.py ++++ b/sphinx/search/en.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage + +diff --git a/sphinx/search/es.py b/sphinx/search/es.py +index c5d9a5c..96956be 100644 +--- a/sphinx/search/es.py ++++ b/sphinx/search/es.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/fi.py b/sphinx/search/fi.py +index 70114f8..5de87ad 100644 +--- a/sphinx/search/fi.py ++++ b/sphinx/search/fi.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/fr.py b/sphinx/search/fr.py +index 01319dd..9b43d74 100644 +--- a/sphinx/search/fr.py ++++ b/sphinx/search/fr.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/hu.py b/sphinx/search/hu.py +index eed08db..4dde945 100644 +--- a/sphinx/search/hu.py ++++ b/sphinx/search/hu.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/it.py b/sphinx/search/it.py +index 7bf712b..9e44732 100644 +--- a/sphinx/search/it.py ++++ b/sphinx/search/it.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/nl.py b/sphinx/search/nl.py +index a610b12..f85bec7 100644 +--- a/sphinx/search/nl.py ++++ b/sphinx/search/nl.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/no.py b/sphinx/search/no.py +index a69380b..8f9be62 100644 +--- a/sphinx/search/no.py ++++ b/sphinx/search/no.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/pt.py b/sphinx/search/pt.py +index 908a417..ee266ef 100644 +--- a/sphinx/search/pt.py ++++ b/sphinx/search/pt.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/ro.py b/sphinx/search/ro.py +index b6c9d67..ee77c77 100644 +--- a/sphinx/search/ro.py ++++ b/sphinx/search/ro.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict, Set + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage + +diff --git a/sphinx/search/ru.py b/sphinx/search/ru.py +index b8412c1..bda63bd 100644 +--- a/sphinx/search/ru.py ++++ b/sphinx/search/ru.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/sv.py b/sphinx/search/sv.py +index 88cc560..52e4983 100644 +--- a/sphinx/search/sv.py ++++ b/sphinx/search/sv.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage, parse_stop_word + +diff --git a/sphinx/search/tr.py b/sphinx/search/tr.py +index f4a865c..934fd41 100644 +--- a/sphinx/search/tr.py ++++ b/sphinx/search/tr.py +@@ -4,7 +4,7 @@ from __future__ import annotations + + from typing import TYPE_CHECKING, Dict, Set + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage + +diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py +index 2a3a6e7..e3ee9d0 100644 +--- a/sphinx/search/zh.py ++++ b/sphinx/search/zh.py +@@ -6,7 +6,7 @@ import os + import re + from typing import TYPE_CHECKING, Dict, List + +-import snowballstemmer ++from . import dummystemmer as snowballstemmer + + from sphinx.search import SearchLanguage + +-- +2.45.2 + diff --git a/SOURCES/sphinx-test_theming.diff b/SOURCES/sphinx-test_theming.diff new file mode 100644 index 0000000..30994a1 --- /dev/null +++ b/SOURCES/sphinx-test_theming.diff @@ -0,0 +1,12 @@ +diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py +--- Sphinx-1.7.6/tests/test_theming.py 2018-07-16 11:24:40.000000000 +0200 ++++ Sphinx-1.7.6_patched/tests/test_theming.py 2018-07-20 15:17:35.049263077 +0200 +@@ -25,7 +25,7 @@ + themes.append('alabaster') + + # test Theme class API +- assert set(app.registry.html_themes.keys()) == set(themes) ++ assert set(app.registry.html_themes.keys()) >= set(themes) + assert app.registry.html_themes['test-theme'] == str(app.srcdir / 'test_theme' / 'test-theme') + assert app.registry.html_themes['ziptheme'] == str(app.srcdir / 'ziptheme.zip') + assert app.registry.html_themes['staticfiles'] == str(app.srcdir / 'test_theme' / 'staticfiles') diff --git a/SPECS/python-sphinx.spec b/SPECS/python-sphinx.spec new file mode 100644 index 0000000..a7e5620 --- /dev/null +++ b/SPECS/python-sphinx.spec @@ -0,0 +1,1041 @@ +# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-* +# Without the packages, we have warnings in docs, but it's not a hard dependency +# We don't want to support sphinxcontrib-* in RHEL, hence disabling the dependencies +%bcond sphinxcontrib %{undefined rhel} +# Also, we don't have all the tests requirements +%bcond tests 1 + +# Unset -s on python shebang to allow RPM-installed sphinx to be used +# with user-installed modules (#1903763) +%undefine _py3_shebang_s + +# No internet in Koji +%bcond internet 0 + +# Build without BuildRequires ImageMagick, to skip imgconverter tests +%bcond imagemagick_tests %{undefined rhel} +# Same for filelock -- we don't want it in RHEL just to run a handful of tests here +%bcond filelock_tests %{undefined rhel} + +# During texlive updates, sometimes the latex environment is unstable +%bcond latex_tests 1 + +Name: python-sphinx +%global general_version 7.2.6 +#global prerel ... +%global upstream_version %{general_version}%{?prerel} +Version: %{general_version}%{?prerel:~%{prerel}} +Release: 9%{?dist} +Epoch: 1 +Summary: Python documentation generator + +# Unless otherwise noted, the license for code is BSD-2-Clause +# sphinx/themes/haiku/static/haiku.css_t has bits licensed with MIT +License: BSD-2-Clause AND MIT + +URL: https://www.sphinx-doc.org/ +Source: %{pypi_source sphinx %{upstream_version}} + +# Allow extra themes to exist. We pull in python3-sphinx-theme-alabaster +# which causes that test to fail. +Patch: sphinx-test_theming.diff + +# Make the first party extensions optional +# This removes the runtime dependencies on: +# - sphinxcontrib.applehelp +# - sphinxcontrib.devhelp +# - sphinxcontrib.jsmath +# - sphinxcontrib.htmlhelp +# - sphinxcontrib.serializinghtml +# - sphinxcontrib.qthelp +# The majority of Fedora RPM packages does not need any of those. +# By removing the dependencies, we minimize the stuff that's pulled into +# the buildroots of 700+ of packages. +# +# This is a downstream-only change - rejected upstream. +# https://github.com/sphinx-doc/sphinx/pull/11747 +Patch: Make-the-first-party-extensions-optional.patch + +# Fix the expected test docstring to match output in Python 3.11.7, 3.12.1 and later +# Proposed upstream. +Patch: https://github.com/sphinx-doc/sphinx/pull/11774.patch + +# Downstream-only patch replacing snowballstemmer +# with a dummy implementation doing nothing. +Patch: Patch-out-snowballstemmer.patch + +# Account for the changes is enum and type aliases representations +Patch: Fix-autodoc-tests-with-Python-3.12.3.patch + +BuildArch: noarch + +BuildRequires: make +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: pyproject-rpm-macros + +%if %{with sphinxcontrib} +# applehelp and jsmath have been orphaned, we cannot use the [docs] extra directly +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport +%endif + +%if %{with tests} +# tests import _testcapi +BuildRequires: python%{python3_pkgversion}-test + +BuildRequires: gcc +BuildRequires: gettext +BuildRequires: graphviz +BuildRequires: texinfo + +%if %{with imagemagick_tests} +BuildRequires: ImageMagick +%endif + +%if %{with latex_tests} +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-collection-latex +BuildRequires: texlive-dvipng +BuildRequires: texlive-dvisvgm +BuildRequires: tex(amsmath.sty) +BuildRequires: tex(amsthm.sty) +BuildRequires: tex(anyfontsize.sty) +BuildRequires: tex(article.cls) +BuildRequires: tex(capt-of.sty) +BuildRequires: tex(cmap.sty) +BuildRequires: tex(color.sty) +BuildRequires: tex(ctablestack.sty) +BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(fancyvrb.sty) +BuildRequires: tex(fncychap.sty) +BuildRequires: tex(framed.sty) +BuildRequires: tex(FreeSerif.otf) +BuildRequires: tex(geometry.sty) +BuildRequires: tex(hyperref.sty) +BuildRequires: tex(kvoptions.sty) +BuildRequires: tex(luatex85.sty) +BuildRequires: tex(needspace.sty) +BuildRequires: tex(parskip.sty) +BuildRequires: tex(polyglossia.sty) +BuildRequires: tex(tabulary.sty) +BuildRequires: tex(titlesec.sty) +BuildRequires: tex(upquote.sty) +BuildRequires: tex(utf8x.def) +BuildRequires: tex(wrapfig.sty) +%endif +%endif + + +%description +Sphinx is a tool that makes it easy to create intelligent and +beautiful documentation for Python projects (or other documents +consisting of multiple reStructuredText sources), written by Georg +Brandl. It was originally created to translate the new Python +documentation, but has now been cleaned up in the hope that it will be +useful to many other projects. + +Sphinx uses reStructuredText as its markup language, and many of its +strengths come from the power and straightforwardness of +reStructuredText and its parsing and translating suite, the Docutils. + +Although it is still under constant development, the following +features are already present, work fine and can be seen "in action" in +the Python docs: + + * Output formats: HTML (including Windows HTML Help) and LaTeX, + for printable PDF versions + * Extensive cross-references: semantic markup and automatic links + for functions, classes, glossary terms and similar pieces of + information + * Hierarchical structure: easy definition of a document tree, with + automatic links to siblings, parents and children + * Automatic indices: general index as well as a module index + * Code handling: automatic highlighting using the Pygments highlighter + * Various extensions are available, e.g. for automatic testing of + snippets and inclusion of appropriately formatted docstrings. + + +%package -n python%{python3_pkgversion}-sphinx +Summary: Python documentation generator + +Recommends: graphviz +Recommends: ImageMagick + +# Upstream Requires those, but we have a patch to remove the dependency. +# We keep them Recommended to preserve the default user experience. +%if %{with sphinxcontrib} +# applehelp and jsmath have been orphaned +Recommends: python%{python3_pkgversion}-sphinxcontrib-devhelp +Recommends: python%{python3_pkgversion}-sphinxcontrib-htmlhelp +Recommends: python%{python3_pkgversion}-sphinxcontrib-serializinghtml +Recommends: python%{python3_pkgversion}-sphinxcontrib-qthelp +%endif + +%description -n python%{python3_pkgversion}-sphinx +Sphinx is a tool that makes it easy to create intelligent and +beautiful documentation for Python projects (or other documents +consisting of multiple reStructuredText sources), written by Georg +Brandl. It was originally created to translate the new Python +documentation, but has now been cleaned up in the hope that it will be +useful to many other projects. + +Sphinx uses reStructuredText as its markup language, and many of its +strengths come from the power and straightforwardness of +reStructuredText and its parsing and translating suite, the Docutils. + +Although it is still under constant development, the following +features are already present, work fine and can be seen "in action" in +the Python docs: + + * Output formats: HTML (including Windows HTML Help) and LaTeX, + for printable PDF versions + * Extensive cross-references: semantic markup and automatic links + for functions, classes, glossary terms and similar pieces of + information + * Hierarchical structure: easy definition of a document tree, with + automatic links to siblings, parents and children + * Automatic indices: general index as well as a module index + * Code handling: automatic highlighting using the Pygments highlighter + * Various extensions are available, e.g. for automatic testing of + snippets and inclusion of appropriately formatted docstrings. + + +%package -n python%{python3_pkgversion}-sphinx-latex +Summary: LaTeX builder dependencies for python%{python3_pkgversion}-sphinx + +Requires: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release} +Requires: texlive-collection-fontsrecommended +Requires: texlive-collection-latex +Requires: texlive-dvipng +Requires: texlive-dvisvgm +Requires: tex(amsmath.sty) +Requires: tex(amsthm.sty) +Requires: tex(anyfontsize.sty) +Requires: tex(article.cls) +Requires: tex(capt-of.sty) +Requires: tex(cmap.sty) +Requires: tex(color.sty) +Requires: tex(ctablestack.sty) +Requires: tex(fancyhdr.sty) +Requires: tex(fancyvrb.sty) +Requires: tex(fncychap.sty) +Requires: tex(framed.sty) +Requires: tex(FreeSerif.otf) +Requires: tex(geometry.sty) +Requires: tex(hyperref.sty) +Requires: tex(kvoptions.sty) +Requires: tex(luatex85.sty) +Requires: tex(needspace.sty) +Requires: tex(parskip.sty) +Requires: tex(polyglossia.sty) +Requires: tex(tabulary.sty) +Requires: tex(titlesec.sty) +Requires: tex(upquote.sty) +Requires: tex(utf8x.def) +Requires: tex(wrapfig.sty) + +# No files in this package, automatic provides don't work: +%py_provides python%{python3_pkgversion}-sphinx-latex + +%description -n python%{python3_pkgversion}-sphinx-latex +Sphinx is a tool that makes it easy to create intelligent and +beautiful documentation for Python projects (or other documents +consisting of multiple reStructuredText sources), written by Georg +Brandl. It was originally created to translate the new Python +documentation, but has now been cleaned up in the hope that it will be +useful to many other projects. + +This package pulls in the TeX dependencies needed by Sphinx's LaTeX +builder. + + +%package doc +Summary: Documentation for %{name} +License: BSD-2-Clause +Recommends: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release} + +%description doc +Sphinx is a tool that makes it easy to create intelligent and +beautiful documentation for Python projects (or other documents +consisting of multiple reStructuredText sources), written by Georg +Brandl. It was originally created to translate the new Python +documentation, but has now been cleaned up in the hope that it will be +useful to many other projects. + +This package contains documentation in the HTML format. + + +%prep +%autosetup -n sphinx-%{upstream_version} -p1 + +%if %{without imagemagick_tests} +rm tests/test_ext_imgconverter.py +%endif + +%if %{without filelock_tests} +sed -i '/filelock/d' pyproject.toml +rm tests/test_build_linkcheck.py tests/test_ext_intersphinx.py +%endif + +%if %{defined rhel} +# unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182 +sed -i '/html5lib/d' pyproject.toml +%endif + +# Sphinx' tests import from each other, this feature is not supported by +# the 'importlib' import mode in pytest. Upstream mitigates this by invoking +# `python -m pytest` rather than `pytest` directly, but in the context of the +# RPM build we explicitly want to test the installed library rather than the +# one from PWD. +# https://github.com/sphinx-doc/sphinx/issues/11740 +sed -i '/"--import-mode=importlib",/d' pyproject.toml + +%generate_buildrequires +%pyproject_buildrequires -r %{?with_tests:-x test} + + +%build +%pyproject_wheel + +export PYTHONPATH=$PWD +pushd doc +export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py" +make html SPHINXBUILD="$SPHINXBUILD" +make man SPHINXBUILD="$SPHINXBUILD" +rm -rf _build/html/.buildinfo +# Those files are copied to _build/html/_images and loaded to the +# html pages from there - we can safely remove the duplicated and unused files +rm -rf _build/html/_static/themes _build/html/_static/tutorial +rm -f _build/html/_static/more.png _build/html/_static/translation.svg +mv _build/html .. +popd + + +%install +%pyproject_install + +# For backwards compatibility. Remove with care, if at all +for i in sphinx-{apidoc,autogen,build,quickstart}; do + ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version} + ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3 +done + +# Clean up non-python files +rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store +rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx + +pushd doc +# Deliver man pages +install -d %{buildroot}%{_mandir}/man1 +for f in _build/man/sphinx-*.1; +do + cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f) +done +popd + +# Move language files to /usr/share; +# patch to support this incorporated in 0.6.6 +pushd %{buildroot}%{python3_sitelib} + +for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`; +do + test $lang == __pycache__ && continue + install -d %{buildroot}%{_datadir}/sphinx/locale/$lang + install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES + mv sphinx/locale/$lang/LC_MESSAGES/sphinx.js \ + %{buildroot}%{_datadir}/sphinx/locale/$lang/ + mv sphinx/locale/$lang/LC_MESSAGES/sphinx.mo \ + %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/ + rm -rf sphinx/locale/$lang +done +popd + +# Create the sphinxcontrib directory, so we can own it +# See https://bugzilla.redhat.com/show_bug.cgi?id=1669790 for rationale +mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib + +%find_lang sphinx + +# Language files; Since these are javascript, it's not immediately obvious to +# find_lang that they need to be marked with a language. +(cd %{buildroot} && find . -name 'sphinx.js') | sed -e 's|^.||' | sed -e \ + 's:\(.*/locale/\)\([^/_]\+\)\(.*\.js$\):%lang(\2) \1\2\3:' \ + >> sphinx.lang + + +%if %{with tests} +%check +# Currently, all linkcheck tests and test_latex_images need internet +# test_build_latex_doc needs internet to download pictures, +# but fails also with it enabled, we decided to skip it entirely +# In RHEL builds, skip tests which use html5lib (excluded above) +# Without snowballstememr, some tests have to be skipped as well. +k="${k-}${k+ and }not test_meta_keys_are_handled_for_language_en" +k="${k-}${k+ and }not test_stemmer" +k="${k-}${k+ and }not test_term_in_heading_and_section" +k="${k-}${k+ and }not test_IndexBuilder" + +%if %{without internet} + k="${k-}${k+ and }not linkcheck" + k="${k-}${k+ and }not test_latex_images" + k="${k-}${k+ and }not test_build_latex_doc" +%endif + +%pytest \ +%if %{defined rhel} + --ignore tests/test_build_html.py \ + --ignore tests/test_build_latex.py \ + --ignore tests/test_build_texinfo.py \ + --ignore tests/test_domain_std.py \ + --ignore tests/test_smartquotes.py \ +%endif +${k+-k }"${k-}" +%endif + + +%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang +%license LICENSE +%doc AUTHORS CHANGES EXAMPLES README.rst +%{_bindir}/sphinx-* +%{python3_sitelib}/sphinx/ +%dir %{python3_sitelib}/sphinxcontrib/ +%{python3_sitelib}/sphinx-%{upstream_version}.dist-info/ +%dir %{_datadir}/sphinx/ +%dir %{_datadir}/sphinx/locale +%dir %{_datadir}/sphinx/locale/* +%{_mandir}/man1/sphinx-* + + +%files -n python%{python3_pkgversion}-sphinx-latex +# empty, this is a metapackage + + +%files doc +%license LICENSE +%doc html + + +%changelog +* Fri Oct 25 2024 MSVSphere Packaging Team - 1:7.2.6-9 +- Rebuilt for MSVSphere 10 + +* Thu Aug 22 2024 Karolina Surma - 1:7.2.6-9 +- Fix build with Python 3.12.3+ + +* Mon Jun 24 2024 Troy Dawson - 1:7.2.6-8 +- Bump release for June 2024 mass rebuild + +* Mon Jun 10 2024 Lumír Balhar - 1:7.2.6-7 +- Replace snowballstemmer with a dummy implementation + +* Wed Jan 24 2024 Karolina Surma - 1:7.2.6-6 +- Suppress traceback when importing the weakened sphinxcontrib* dependencies + +* Mon Jan 22 2024 Fedora Release Engineering - 1:7.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Dec 12 2023 Karolina Surma - 1:7.2.6-4 +- Fix the tests run when building with Python 3.11.7, 3.12.1 and later + +* Thu Nov 16 2023 Miro Hrončok - 1:7.2.6-3 +- On Fedora, BuildRequire the sphinxcontrib packages to build the documentation + +* Wed Nov 08 2023 Miro Hrončok - 1:7.2.6-2 +- Weaken the runtime dependency on: + - python3-sphinxcontrib-applehelp + - python3-sphinxcontrib-devhelp + - python3-sphinxcontrib-jsmath + - python3-sphinxcontrib-htmlhelp + - python3-sphinxcontrib-serializinghtml + - python3-sphinxcontrib-qthelp +- Packages that want to use them during build need to BuildRequire them explicitly + +* Thu Oct 26 2023 Karolina Surma - 1:7.2.6-1 +- Update to 7.2.6 +- Fixes rhbz#2232469 + +* Thu Sep 21 2023 Karolina Surma - 1:7.1.2-2 +- Fix FTBFS with Pygments 2.16+ + +* Mon Aug 14 2023 Karolina Surma - 1:7.1.2-1 +- Update to 7.1.2 +- Fixes rhbz#2225274 + +* Mon Aug 07 2023 Karolina Surma - 1:7.0.1-1 +- Update to 7.0.1 + +* Thu Jul 27 2023 Miro Hrončok - 1:6.2.1-4 +- Don't use filelock to test this package on RHEL + +* Fri Jul 21 2023 Fedora Release Engineering - 1:6.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 13 2023 Karolina Surma - 1:6.2.1-2 +- Don't use websupport to build documentation on RHEL + +* Mon Jun 26 2023 Karolina Surma - 1:6.2.1-1 +- Update to 6.2.1 +- Fixes rhbz#2188968 + +* Fri Jun 16 2023 Python Maint - 1:6.1.3-4 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 1:6.1.3-3 +- Bootstrap for Python 3.12 + +* Wed May 31 2023 Yaakov Selkowitz - 1:6.1.3-2 +- Avoid html5lib test dependency in RHEL builds + +* Fri Mar 10 2023 Karolina Surma - 1:6.1.3-1 +- Update to 6.1.3 +- Fixes rhbz#2135122 + +* Thu Mar 09 2023 Karolina Surma - 1:5.3.0-4 +- Fix tests related to missing setuptools and Babel 2.12 +- Fixes rhbz#2176685 + +* Tue Jan 31 2023 Karolina Surma - 1:5.3.0-3 +- Fix tests with python-pygments 2.14+ + +* Fri Jan 20 2023 Fedora Release Engineering - 1:5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 08 2022 Karolina Surma - 1:5.3.0-1 +- Update to 5.3.0 +- Fixes rhbz#2129546 + +* Mon Aug 15 2022 Karolina Surma - 1:5.1.1-1 +- Update to 5.1.1 +- Fixes rhbz#2110473 +- Remove reST documentation from the -doc package, ship only HTML + +* Fri Jul 22 2022 Fedora Release Engineering - 1:5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 21 2022 Karolina Surma - 1:5.0.2-1 +- Update to 5.0.2 + +* Mon Jun 13 2022 Python Maint - 1:4.5.0-3 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 1:4.5.0-2 +- Bootstrap for Python 3.11 + +* Fri Apr 01 2022 Karolina Surma - 1:4.5.0-1 +- Update to 4.5.0 +- Fixes rhbz#2068924 + +* Tue Feb 01 2022 Karolina Surma - 1:4.4.0-1 +- Update to 4.4.0 +- Fixes rhbz#2033955 + +* Fri Jan 21 2022 Fedora Release Engineering - 1:4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 29 2021 Karolina Surma - 1:4.3.1-1 +- Update to 4.3.1 +- Fixes rhbz#2027059 + +* Fri Nov 19 2021 Karolina Surma - 1:4.3.0-1 +- Update to 4.3.0 +- Fixes rhbz#2022111 + +* Fri Sep 17 2021 Karolina Surma - 1:4.2.0-1 +- Update to 4.2.0 +- Fixes rhbz#2003427 + +* Thu Sep 16 2021 Karolina Surma - 1:4.1.2-3 +- Display typing objects correctly with Python 3.10 (fix FTBFS) +- Generate correct reference to parent class if class has `_name` attribute +- Enable previously deselected test + +* Wed Aug 18 2021 Karolina Surma - 1:4.1.2-2 +- Patch python-sphinx to work with python-pygments >=2.10 + +* Mon Aug 02 2021 Karolina Surma - 1:4.1.2-1 +- Update to 4.1.2 +- Fixes rhbz#1979326 +- Backport commit to fix python-sphinx with Python 3.10-rc1 + +* Fri Jul 23 2021 Fedora Release Engineering - 1:4.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 11 2021 Karolina Surma - 1:4.0.2-1 +- Update to 4.0.2 +- Fixes rhbz#1948279 + +* Thu Jun 03 2021 Python Maint - 1:3.5.4-3 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 1:3.5.4-2 +- Bootstrap for Python 3.10 + +* Mon May 10 2021 Karolina Surma - 1:3.5.4-1 +- Update to 3.5.4 +- Fixes rhbz#1949477 + +* Thu Apr 01 2021 Karolina Surma - 1:3.5.3-1 +- Update to 3.5.3 +- Fixes rhbz#1941161 + +* Wed Mar 10 2021 Charalampos Stratakis - 1:3.5.2-1 +- Update 3.5.2 +- Fixes rhbz#1928459 + +* Wed Jan 27 2021 Fedora Release Engineering - 1:3.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 19 2021 Charalampos Stratakis - 1:3.4.3-1 +- Update to 3.4.3 +- Fixes rhbz#1909494 + +* Sat Dec 05 2020 Mattia Verga - 1:3.3.1-2 +- Unset -s from python shebang +- Fixes: rhbz#1903763 + +* Mon Nov 23 2020 Miro Hrončok - 1:3.3.1-1 +- Update to 3.3.1 +- Fixes: rhbz#1893752 + +* Wed Oct 14 2020 Tomas Hrnciar - 1:3.2.1-2 +- Backport commit to fix python-sphinx with python-pygments v2.7.1 + +* Tue Aug 18 2020 Miro Hrončok - 1:3.2.1-1 +- Update to 3.2.1 +- Remove compatibility symbolic links from /usr/libexec/ +- Fixes rhbz#1867294 + +* Fri Aug 07 2020 Miro Hrončok - 1:3.1.2-1 +- Update to 3.1.2 +- Fixes rhbz#1853901 + +* Wed Jul 29 2020 Fedora Release Engineering - 1:3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 30 2020 Charalampos Stratakis - 1:3.1.1-1 +- Update to 3.1.1 (#1783776) + +* Sat May 23 2020 Miro Hrončok - 1:2.2.2-4 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 1:2.2.2-3 +- Bootstrap for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1:2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 10 2019 Miro Hrončok - 1:2.2.2-1 +- Update to 2.2.2 (rhbz#1743018) + +* Thu Oct 03 2019 Miro Hrončok - 1:2.1.2-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Fri Aug 16 2019 Miro Hrončok - 1:2.1.2-5 +- Rebuilt for Python 3.8 + +* Thu Aug 15 2019 Miro Hrončok - 1:2.1.2-4 +- Bootstrap for Python 3.8 + +* Thu Aug 15 2019 Richard Shaw - 1:2.1.2-3 +- Rebuild for Python 3.8. + +* Fri Jul 26 2019 Fedora Release Engineering - 1:2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 23 2019 Miro Hrončok - 1:2.1.2-1 +- Update to 2.1.2 (#1716158) + +* Wed Apr 10 2019 Miro Hrončok - 1:2.0.1-1 +- Update to 2.0.1 (#1697544) +- Own the sphinxcontrib directory (#1669790) + +* Wed Mar 27 2019 Charalampos Stratakis - 1:2.0.0~b2-1 +- Update to 2.0.0b2 + +* Wed Feb 27 2019 Miro Hrončok - 1:2.0.0~b1-1 +- Update to 2.0.0b1 +- Drop Python 2 package +- https://fedoraproject.org/wiki/Changes/Sphinx2 + +* Thu Feb 07 2019 Alfredo Moralejo - 1:1.8.4-1 +- Update to 1.8.4. + +* Sat Feb 02 2019 Fedora Release Engineering - 1:1.7.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 1:1.7.6-2 +- Drop explicit locale setting for python3, use C.UTF-8 for python2 + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + +* Mon Jul 23 2018 Marcel Plch - 1:1.7.6-1 +- Update to 1.7.6 + +* Fri Jul 13 2018 Miro Hrončok - 1:1.7.5-6 +- Remove unused dependencies on xapian and simplejson + +* Thu Jul 5 2018 Zbigniew Jędrzejewski-Szmek - 1:1.7.5-5 +- Add patch to fix build if alabaster theme is installed +- Add patch for #1589868 + +* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-4 +- Enable tests + +* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-3 +- Enable websupport + +* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-2 +- Rebuilt for Python 3.7 + +* Tue Jun 19 2018 Charalampos Stratakis - 1:1.7.5-1 +- Update to 1.7.5 (bz#1570451) + +* Mon Jun 18 2018 Miro Hrončok - 1:1.7.2-5 +- Rebuilt for Python 3.7 + +* Fri Jun 15 2018 Miro Hrončok - 1:1.7.2-4 +- Bootstrap for Python 3.7 + +* Thu Jun 14 2018 Miro Hrončok - 1:1.7.2-3 +- Bootstrap for Python 3.7 + +* Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-2 +- Conditionalize the ImageMagick build dependency & tests + +* Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-1 +- Update to 1.7.2 (bz#1558968) + +* Tue Mar 13 2018 Charalampos Stratakis - 1:1.7.1-1 +- Update to 1.7.1 (bz#1534802) + +* Fri Feb 09 2018 Fedora Release Engineering - 1:1.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 09 2018 Charalampos Stratakis - 1:1.6.6-1 +- Update to 1.6.6 (bz#1532435) + +* Mon Dec 11 2017 Iryna Shcherbina - 1:1.6.5-2 +- Fix ambiguous Python 2 dependency declarations + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Mon Nov 06 2017 Charalampos Stratakis - 1:1.6.5-1 +- Update to 1.6.5 (bz#1508237) + +* Mon Oct 09 2017 Troy Dawson - 1:1.6.4-2 +- Cleanup spec file conditionals + +* Tue Sep 26 2017 Charalampos Stratakis - 1:1.6.4-1 +- Update to 1.6.4 (bz#1426928) + +* Wed Sep 20 2017 Charalampos Stratakis - 1:1.6.3-3 +- Provide the epoch tag in order to keep the upgrade path clean. + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jul 20 2017 Charalampos Stratakis - - 1.6.3-1 +- Update to 1.6.3 (bz#1426928) + +* Sat Feb 18 2017 Toshio Kuratomi - - 1.5.2-2 +- Cleanup source files that should not be installed +- Fix the __init__.pyc that was byte compiled for the wrong python + +* Fri Feb 17 2017 Toshio Kuratomi - - 1.5.2-1 +- Update to 1.5.2 +- Remove a few latex dependencies that are no longer needed +- Remove xapian patch; now in upstream tarball + +* Sat Feb 11 2017 Fedora Release Engineering - 1.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 31 2017 Toshio Kuratomi - - 1.5.1-5 +- environment-modules is less featureful than Lmod. + - Select the default version in a different way since environment-modules + didn't understand the symlink + - Ignore error messsages in the shell startup script as environment-modules + prints an error message if a module has already been loaded. The command + is doing the right thing for this case except that it's also printing an + error message. + +* Thu Jan 26 2017 Toshio Kuratomi - - 1.5.1-4 +- Add recipe for setting the system default to the README.fedora + +* Wed Jan 18 2017 Toshio Kuratomi - - 1.5.1-3 +- Move the unversioned executables into the python2 package as they are now + using python2 to run + +* Wed Jan 18 2017 Toshio Kuratomi - - 1.5.1-2 +- Add README.fedora so people know how to use environment-modules to switch. +- Change the default to be the python2 version to match with the guidelines +- Switch to generic environment(modules) instead of Lmod specifically. + +* Fri Dec 30 2016 Orion Poplawski - 1.5.1-1 +- Update to 1.5.1 + +* Fri Dec 30 2016 Toshio Kuratomi - 1.4.9-2 +- Remove alternatives. Alternatives should only be used for a very small + number of packages (system daemons which also have a compatible command line + interface). +- Use environment-modules to switch between the python2 and python3 packages + *but* be aware that no amount of manual switching can get this 100% right. + The code has to be fixed upstream, not in packaging. + +* Tue Dec 13 2016 Charalampos Stratakis - 1.4.9-1 +- Update to 1.4.9 +- Enable python3 tests + +* Mon Dec 12 2016 Charalampos Stratakis - 1.4.8-3 +- Rebuild for Python 3.6 +- Disable python3 tests for now + +* Thu Oct 6 2016 Avram Lubkin - 1.4.8-2 +- Added tex(luatex85.sty) dependency to support TexLive 2016 + +* Thu Oct 6 2016 Avram Lubkin - 1.4.8-1 +- Update to 1.4.8 +- Alternatives fails for scripts sometimes (bz#1382405) + +* Sun Sep 4 2016 Avram Lubkin - 1.4.6-2 +- Alternatives fails for man pages due to existing files + +* Fri Sep 2 2016 Avram Lubkin - 1.4.6-1 +- Update to 1.4.6 (bz#1370810) +- Fix unversioned Obsoletes +- Add alternatives slaves for man pages + +* Fri Aug 12 2016 Avram Lubkin - 1.4.5-1 +- Update to 1.4.5 (bz#1356336) +- Remove Recommends for latex, locale, and doc subpackages (bz#1366624) +- Remove Requires from locale subpackage (bz#1366624) +- Set executable scripts via alternatives (bz#1321413) +- Change graphviz Requires to Recommends (bz#1366706) + +* Sun Jul 03 2016 Avram Lubkin - 1.4.4-2 +- doc and locale no longer specifically require python2-sphinx +- Colapsed python3-sphinx-latex into python-latex + +* Sun Jun 12 2016 Avram Lubkin - 1.4.4-1 +- Updated to 1.4.4 +- Added python-sphinx-locale for common locale files + +* Thu Feb 04 2016 Fedora Release Engineering - 1.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-4 +- Obsolete napoleon extension, it is now packaged with sphinx (#1286275) +- Rename python2-Sphinx to python2-sphinx +- Add conflicts to disallow parallel installation of different versions, + which causes file conflicts because of the shared documentation files. + +* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-3 +- Restore using python2 scripts by default (#1285535) + +* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-2 +- Fix requirements of python2- subpackage +- Provide sphinx-*-{3.5,3} symlinks for each script + +* Tue Nov 24 2015 Julien Enselme - 1.3.1-1 +- Update to 1.3.1 (#1136284) +- Update to new guidelines +- Make the default executable use python3 + +* Tue Oct 13 2015 Robert Kuska - 1.2.3-5 +- Rebuilt for Python3.5 rebuild +- add patch to reflect that Python3.5 dropped HTMLParserError + +* Mon Jul 20 2015 Michel Alexandre Salim - 1.2.3-4 +- Fix line encoding of bundled jquery.js + +* Mon Jul 20 2015 Michel Alexandre Salim - 1.2.3-3 +- Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies + +* Thu Jun 18 2015 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Feb 5 2015 Michel Alexandre Salim - 1.2.3-1 +- Update to 1.2.3 +- Mark license file with %%license instead of %%doc + +* Thu Feb 5 2015 Michel Alexandre Salim - 1.2.2-10 +- Complete LaTeX builder deps (fixes bz#882166) +- Make test output verbose +- Add BRs needed to enable all tests + +* Tue Feb 3 2015 Michel Alexandre Salim - 1.2.2-9 +- python3-sphinx package also Provides: python3-sphinx-latex + +* Tue Feb 3 2015 Michel Alexandre Salim - 1.2.2-8 +- If a separate LaTeX subpackage is not generated, the main package should have + a virtual Provides: for it (bz#1187989) + +* Tue Jan 27 2015 Michel Alexandre Salim - 1.2.2-7 +- Disable separate LaTeX builder for now (bz#1185574) + +* Thu Jan 22 2015 Michel Alexandre Salim - 1.2.2-6 +- Split off LaTeX builder into its own subpackages, to remove TeXLive + dependencies from the main package. + Thanks to Robert Kuska for feedback +- Clean up python3-sphinx's locale files, they ended up in the python2 package. + Share the locale files in /usr/share instead + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 27 2014 Bohuslav Kabrda - 1.2.2-4 +- Don't own the -3 scripts by python 2 package + +* Thu May 22 2014 Bohuslav Kabrda - 1.2.2-3 +- Add sphinx-*-3 links to scripts +Resolves: #1098109 + +* Fri May 9 2014 Orion Poplawski - 1.2.2-2 +- Rebuild for Python 3.4 + +* Fri May 9 2014 Orion Poplawski - 1.2.2-1 +- Update to 1.2.2 + +* Thu Feb 13 2014 Michel Salim - 1.2.1-1 +- Update to 1.2.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Mar 9 2013 Michel Salim - 1.1.3-7 +- Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot + +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Aug 21 2012 Toshio Kuratomi - 1.1.3-5 +- Fix for use of sphinx's manpage writer with docutils-0.10 + +* Mon Aug 6 2012 Michel Salim - 1.1.3-4 +- Rebuild for Python 3.3 + +* Fri Aug 3 2012 David Malcolm - 1.1.3-3 +- remove rhel logic from with_python3 conditional + +* Sat Jul 21 2012 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Apr 5 2012 Michel Salim - 1.1.3-1 +- Update to 1.1.3 + +* Sun Feb 5 2012 Michel Salim - 1.1.2-5 +- Move python3 runtime dependencies to the right subpackage +- Properly exclude python3 binaries + +* Sat Jan 14 2012 Fedora Release Engineering - 1.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Dec 17 2011 Michel Salim - 1.1.2-3 +- BR on texlive-latex for LaTeX tests + +* Thu Dec 8 2011 Michel Salim - 1.1.2-2 +- Enable python3 subpackage + +* Mon Nov 28 2011 Toshio Kuratomi - 1.1.2-1 +- Update to upstream 1.1.2 + +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 18 2011 Toshio Kuratomi - 1.0.7-1 +- Update to upstream 1.0.7 + +* Mon Jan 17 2011 Toshio Kuratomi - 1.0.6-1 +- Update to upstream 1.0.6 + +* Mon Nov 1 2010 Michel Salim - 1.0.4-3 +- Fix -doc Makefile to allow regeneration of .rst files + +* Mon Nov 1 2010 Michel Salim - 1.0.4-2 +- Actually include *.js locale files +- Generate manpages + +* Fri Sep 17 2010 Michel Salim - 1.0.4-1 +- Update to 1.0.4 +- Remove BuildRoot and %%clean declarations + +* Thu Jul 22 2010 David Malcolm - 1.0-0.1.b2.1 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon May 31 2010 Toshio Kuratomi - 1.0-0.2.b2 +- Update to 1.0 beta 2 +- Fixes problem building html documentation in non-English locales + +* Wed May 26 2010 Michel Salim - 1.0-0.1.b1 +- Update to 1.0 beta 1 + +* Tue May 25 2010 Michel Salim - 0.6.6-1 +- Update to 0.6.6 + +* Fri May 21 2010 Toshio Kuratomi - 0.6.5-2 +- Few minor tweaks to Gareth's spec file update + +* Mon May 10 2010 Gareth Armstrong - 0.6.5-1.hp +- Update to 0.6.5 +- Initial import of python-sphinx from Fedora Rawhide for use in HP CMS +- Enforce that Sphinx requires Python 2.4 or later via an explicit BR +- Minor tweaks to spec file +- Move language files to %%{_datadir}, idea borrowed from Debian's sphinx + package +- Deliver man pages for sphinx-build & sphinx-quickstart +- Deliver rst documentation files to reST directory in doc sub-package +- Add %%check section for Python2 and add BR on python-nose + +* Wed Jan 13 2010 Toshio Kuratomi - 0.6.4-1 +- Update to 0.6.4 +- Fixes a problem using autodoc with pylons projects. + +* Fri Sep 4 2009 Michel Salim - 0.6.3-1 +- Update to 0.6.3 + +* Mon Aug 17 2009 Toshio Kuratomi - 0.6.2-1 +- Update to 0.6.2 -- upstream bugfix requested inside bz#512438 + +* Sun Jul 26 2009 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jun 05 2009 Luke Macken - 0.6.1-2 +- Add a patch to use our own setuptools package + +* Fri Apr 17 2009 Michel Salim - 0.6.1-1 +- Update to 0.6.1 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 2 2009 Michel Salim - 0.5.1-1 +- Update to 0.5.1 + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.5-2 +- Rebuild for Python 2.6 + +* Mon Nov 24 2008 Michel Salim - 0.5-1 +- Update to 0.5 + +* Fri Oct 10 2008 Michel Salim - 0.4.3-1 +- Update to 0.4.3 + +* Wed Aug 27 2008 Toshio Kuratomi - 0.4.2-1.1 +- Fix for EL-5 build. + +* Mon Aug 25 2008 Michel Salim - 0.4.2-1 +- Update to 0.4.2 + +* Mon May 26 2008 Michel Salim - 0.3-1 +- Update to 0.3 + +* Fri May 2 2008 Michel Salim - 0.1.61950-3 +- Split documentation into subpackage +- Exclude C files (not built by default anyway) + +* Wed Apr 16 2008 José Matos - 0.1.61950-2 +- Build html documentation, include it and include the rst + documentation. + +* Thu Mar 27 2008 Michel Salim 0.1.61950-1 +- Initial package