diff --git a/Sphinx-3.3.1.tar.gz b/Sphinx-3.3.1.tar.gz deleted file mode 100644 index 4afd656..0000000 --- a/Sphinx-3.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e8d592225447104d1172be415bc2972bd1357e3e12fdc76edf2261105db4300 -size 5979919 diff --git a/Sphinx-3.3.1.tar.gz.asc b/Sphinx-3.3.1.tar.gz.asc deleted file mode 100644 index eeafa96..0000000 --- a/Sphinx-3.3.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEihG3ml0NdJpm8KAwECwsF0mNa54FAl+tRRMACgkQECwsF0mN -a55jUw//e60TRGNBMUYvVlgjCYqPIyyoT2CjUL0YxuB1z4IeYPnkRGuaD1fTjEAt -UAHl0LV7/HrqLeLk/9HsZcxSbRYZ1D0Z7Ifwoi+/1lg8R+E8AJcpdZbsUkMpRiiz -xw2MibHQ+V5CiggqD2slTtJRsdGXnQwyNLD2MSRzPJpNd1cJgyZnrZHvO3hRc//u -80Zl1vyrwP8GhQzJeHN1xT4EbhhdBiw+VeWnbeNoMJQky0JgC/xTMhoYMoyxhP1q -DzeiqOuwnAngk0tlV5NUaqpV3Mw1SR9L/u1WnaKsq1KdXZbc8Rue2rEBbbbcXhqv -P7SsIRxLxobpTayAwiiUE+HPcQLuX+/W9ZaV7J/kE8H7k4+37GRhneX8bZoD+zGi -Gd7rMBCo2uM0IZQyc6FidGurl/IpN5hOJoe47yP0VbRjox+K1lsYxiSrxZMNifyY -0U7wyNnjYpE8sZMgahd4VlHWC4sTNsCFYliG2uKUrO1BEwSVeAslm8fJj5M/0AjR -kwP2kS1owEapFckeJ2P0N+7VBfFY8hdDnCi0lEdZZ8ZVxzoMjgUnb/nbbYl5aCPF -B1Srqbz8SLk2r87RlpC2l/ZHmeryrebIJ1QGLAOFEx4hj2rvrBmd8o8AHBO6pFCw -DQT4KOpSSb5Fp3EIWCHQ3PiKwpWiB9DfxMvOiwWhh/9BrXVufPE= -=yB97 ------END PGP SIGNATURE----- diff --git a/Sphinx-3.4.3.tar.gz b/Sphinx-3.4.3.tar.gz new file mode 100644 index 0000000..f15316e --- /dev/null +++ b/Sphinx-3.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c +size 5997116 diff --git a/Sphinx-3.4.3.tar.gz.asc b/Sphinx-3.4.3.tar.gz.asc new file mode 100644 index 0000000..2ce6ce3 --- /dev/null +++ b/Sphinx-3.4.3.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEihG3ml0NdJpm8KAwECwsF0mNa54FAl/3NA0ACgkQECwsF0mN +a55HSg//e/8rNjUqr96xgIFT7gHBSoV/yTgsF6NwOCgUeQwbG91eFeXh/4B9Lah7 +YNxkBU0TsHZXW/JjgaABOsDUSx2Slkmq1KzR/oYyoo03jusKKb12go8lYTrXkpk0 +Xgye+prn7hEbjhT5Be7jjVALlEXKdvkTBM9zIuiTK2tCQJmy1mSW60NuKcOpwFzs +P4GlY8d61SxKstrm58pkrQ5yHx4nH369Ahpdv9paQODTYTvad2gTH47KWk2mPP78 +Iyi0SVvc/8gaAkRJ0r2nrM7aVqCKrtcUoqfxzt+g0Ziwgk4gSdZNnzwgkZeHVX+P +oyN+zBOdeL7tBMwl21RU2d3npNaPuz7Y2UkVyJZOq5gsfNXKA3TxY/qmk0cvvzTP +zZ7vSpzlvH03MQjBhU7g1DcK329OxFbl2tjNWrX1xDUBmCzuWCNGlGR8xKEcTRGY +h9NOyiDcl8amjNnKxL+9MkIsppFEe66nQ4re+lBgZDWCQXD/UQvryvdbDtlLSNh/ +aXpi9srMheLlSUzU7cXIgiLdIqYcK/K4NmLhPIrzdG/SoKGlluDsaJI06ZjTefrV +f1+C0DBKnXKSzrToHS1IykJ7J20/gzSaJJrc13Ozk3pPeDocGJv0LLxvUzSQxOjJ +exmtoR/gH/iMBrihnOAodOVl2zCM+rhWBfMfO7umHiEq0gEHoyM= +=lIDu +-----END PGP SIGNATURE----- diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 4432bb8..5b08593 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Wed Jan 13 08:15:17 UTC 2021 - Markéta Machová + +- Update to 3.4.3 + * Bugfix release, see upstream CHANGES + +------------------------------------------------------------------- +Mon Jan 11 14:09:59 UTC 2021 - Markéta Machová + +- Do not download python (and requests) documentation in the runtime. +- Add file requests.inv + +------------------------------------------------------------------- +Tue Dec 29 20:31:46 UTC 2020 - Dirk Müller + +- update to 3.4.1: + * #8105: autodoc: the signature of class constructor will be shown for decorated + classes, not a signature of decorator + * #8119: autodoc: Allow to determine whether a member not included in + ``__all__`` attribute of the module should be documented or not via + :event:`autodoc-skip-member` event + * #8219: autodoc: Parameters for generic class are not shown when super class is + a generic class and show-inheritance option is given (in Python 3.7 or above) + * autodoc: Add ``Documenter.config`` as a shortcut to access the config object + * autodoc: Add Optional[t] to annotation of function and method if a default + value equal to None is set. + * #8209: autodoc: Add ``:no-value:`` option to :rst:dir:`autoattribute` and + :rst:dir:`autodata` directive to suppress the default value of the variable + * #8460: autodoc: Support custom types defined by typing.NewType + * #8285: napoleon: Add :confval:`napoleon_attr_annotations` to merge type hints + on source code automatically if any type is specified in docstring + * #8236: napoleon: Support numpydoc's "Receives" section + * #6914: Add a new event :event:`warn-missing-reference` to custom warning + messages when failed to resolve a cross-reference + * #6914: Emit a detailed warning when failed to resolve a ``:ref:`` reference + * #6629: linkcheck: The builder now handles rate limits. See + :confval:`linkcheck_retry_on_rate_limit` for details. + * Large number of bugfixes, see included NEWS +- remove sphinx-pr8520-fix-AliasNode-copy.patch (upstream) + ------------------------------------------------------------------- Fri Dec 4 17:19:43 UTC 2020 - Benjamin Greiner diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 15d5ef4..1c725ee 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -1,7 +1,7 @@ # # spec file for package python-Sphinx # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %endif %define skip_python2 1 Name: python-Sphinx%{psuffix} -Version: 3.3.1 +Version: 3.4.3 Release: 0 Summary: Python documentation generator License: BSD-2-Clause @@ -38,9 +38,8 @@ Source: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-% Source1: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz.asc # Provide intersphinx inventory offline Source2: https://docs.python.org/3/objects.inv#/python3.inv +Source3: https://requests.readthedocs.io/en/master/objects.inv#/requests.inv Source99: python-Sphinx-rpmlintrc -# PATCH-FIX-UPSTREAM gh#sphinx-doc/sphinx#8520 -Patch0: https://github.com/sphinx-doc/sphinx/pull/8520.patch#/sphinx-pr8520-fix-AliasNode-copy.patch BuildRequires: %{python_module base} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -235,10 +234,13 @@ sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line en mkdir build.doc cp %{SOURCE2} doc/python3.inv +cp %{SOURCE3} doc/requests.inv %{python_expand # Use one bundled intersphinx inventory for all flavors. # The python3.6 inventory fails to build even in its own flavor. # Use a more recent default (currently 3.9) from the source tag instead. -sed -i -e "s/\(intersphinx_mapping = ..python.: (.https:..docs.python.org.3.., \)None\()\)/\1'python3.inv'\2/g" doc/conf.py +# 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:..requests.readthedocs.io.*, \)None\()\)/\1'requests.inv'\2/g" doc/conf.py $python setup.py build_sphinx rm build/sphinx/html/.buildinfo $python setup.py build_sphinx -b man diff --git a/python3.inv b/python3.inv index 9b2066a..366b108 100644 --- a/python3.inv +++ b/python3.inv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84d87706db08de202b66d8fb95cbf27dacd52378050c36e439a270eb5d0c3dc2 -size 109517 +oid sha256:95665d7a35dcc74d8ad70772551c8f1a8adc330771621ec41f5991fb046c193c +size 109538 diff --git a/requests.inv b/requests.inv new file mode 100644 index 0000000..70103dc Binary files /dev/null and b/requests.inv differ diff --git a/sphinx-pr8520-fix-AliasNode-copy.patch b/sphinx-pr8520-fix-AliasNode-copy.patch deleted file mode 100644 index 92fcf16..0000000 --- a/sphinx-pr8520-fix-AliasNode-copy.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3c5b05de514289c30130ef98fa796591e1acdb29 Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Fri, 4 Dec 2020 20:27:25 +0100 -Subject: [PATCH 1/2] Fix AliasNode.copy() - ---- - sphinx/domains/c.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py -index d18094217a..206d049f75 100644 ---- a/sphinx/domains/c.py -+++ b/sphinx/domains/c.py -@@ -3452,7 +3452,8 @@ def __init__(self, sig: str, maxdepth: int, document: Any, env: "BuildEnvironmen - self.parentKey = parentKey - - def copy(self: T) -> T: -- return self.__class__(self.sig, env=None, parentKey=self.parentKey) # type: ignore -+ return self.__class__(self.sig, self.maxdepth, self.document, -+ env=None, parentKey=self.parentKey) # type: ignore - - - class AliasTransform(SphinxTransform): - -From a549d8ff2e0371531b8ec8af1d2133812d60b2bb Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Fri, 4 Dec 2020 20:48:02 +0100 -Subject: [PATCH 2/2] Fix mypy type error - ---- - sphinx/domains/c.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py -index 206d049f75..38b81e3fa6 100644 ---- a/sphinx/domains/c.py -+++ b/sphinx/domains/c.py -@@ -3451,9 +3451,9 @@ def __init__(self, sig: str, maxdepth: int, document: Any, env: "BuildEnvironmen - assert parentKey is not None - self.parentKey = parentKey - -- def copy(self: T) -> T: -+ def copy(self) -> 'AliasNode': - return self.__class__(self.sig, self.maxdepth, self.document, -- env=None, parentKey=self.parentKey) # type: ignore -+ env=None, parentKey=self.parentKey) - - - class AliasTransform(SphinxTransform):