diff options
Diffstat (limited to 'dev-python/sphinx')
| -rw-r--r-- | dev-python/sphinx/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch | 34 |
2 files changed, 0 insertions, 35 deletions
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest index 0da30b25a9b9..eb19fa31329d 100644 --- a/dev-python/sphinx/Manifest +++ b/dev-python/sphinx/Manifest @@ -1,6 +1,5 @@ AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c -AUX sphinx-7.3.7-opt-defusedxml.patch 1427 BLAKE2B a28078b9ec5304b4c1fba687b83b2260a8edc1cbbcb75b542aec8fa8d6c122780a99686e840c515df4d83d5c7451c5f39bdb0107fe908e31ccbbce2f7430329a SHA512 46d1abda3fde606e663c129af2ebec055e80fb7ad71afb30e85518ddd2f9da6cfd9e72d34473790ca161997bd937a8cf0303f19cb45b8a524617bd3dc9e03d92 DIST sphinx-7.4.7.gh.tar.gz 8135111 BLAKE2B b5a511355b16edfbcf32f9a20855466251c592a7fbffa33a84d84369f2a9de7767cd9529cce3f350cdf25bfbb53534ddea70d9482c1d6d78e9ab160d2c9821e8 SHA512 bfb48d4dc09f108986c5b7737710c7495fbdd83eb18f2a1c77bc9d324c499bffb5103f65ebf7396260f10c0f89eddb1ae5eb8d037bd33fffd748483f4391a7e1 DIST sphinx-8.0.2.gh.tar.gz 8264835 BLAKE2B ed6e321a1e58341609d88993c418ec1a0a580683ed28895077322fdba839d5c158007d65d5349d4d53c5e3b49ae823142cc6eb0203812580ebbb5b95247bf157 SHA512 5e9f38af91d7a80b6a80a80ab26adbebc1c3303996182a58eed9120ed896c5bfde022616e116e8cb8195fe03741e93fd97dcacccf492912ab147c5bfcb79213d EBUILD sphinx-7.4.7.ebuild 5262 BLAKE2B 30795ea4e55042a0ad33d74a066955ed1d933ccd7f7788c0b8a07729e618b5b6d05e6df018d9fbcb76df3fd977ab9ea7eaaee5b9f81cd457a02070accf3012a1 SHA512 0aa19cd9168b11214d4c4dc40371ec94b668b5f905bde8f1c7a3fcddce75af4d70627d65dbb80d34754db45ee4a7866e4207eb6b2c69597612bebb04ce82aee4 diff --git a/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch b/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch deleted file mode 100644 index cb70e2cf89fc..000000000000 --- a/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ce86026f3b667949ef39f7fdab9a40941d99c5ca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 11 May 2024 18:31:02 +0200 -Subject: [PATCH] DEPS: Lazy import `defusedxml` only when necessary (#12362) - -The `defusedxml` dependency was added to `sphinx.testing` in sphinx 7.3, -but it is not part of the core sphinx dependencies, and not strictly necessary for the running of the pytest plugin. -This commit moves the import into the only function which uses it, -so that the pytest plugins can be used again without this dependency. ---- - sphinx/testing/util.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sphinx/testing/util.py b/sphinx/testing/util.py -index d1de8ea2b7..b2df709eea 100644 ---- a/sphinx/testing/util.py -+++ b/sphinx/testing/util.py -@@ -11,7 +11,6 @@ - from types import MappingProxyType - from typing import TYPE_CHECKING - --from defusedxml.ElementTree import parse as xml_parse - from docutils import nodes - from docutils.parsers.rst import directives, roles - -@@ -73,6 +72,8 @@ def assert_node(node: Node, cls: Any = None, xpath: str = "", **kwargs: Any) -> - # keep this to restrict the API usage and to have a correct return type - def etree_parse(path: str | os.PathLike[str]) -> ElementTree: - """Parse a file into a (safe) XML element tree.""" -+ from defusedxml.ElementTree import parse as xml_parse -+ - return xml_parse(path) - - |