fa05224c39
Upstream dropped the dependency on filelock and html5lib, so the relevant conditionals in the specfile were removed. sphinx-test_theming.patch needed to be rebased, so it is now a proper git patch. The pytest --import-mode=importlib problem was fixed upstream.
145 lines
5.7 KiB
Diff
145 lines
5.7 KiB
Diff
From 14da0bb6073a1ec60432340035d17948b3adb22a Mon Sep 17 00:00:00 2001
|
|
From: Chris Sewell <chrisj_sewell@hotmail.com>
|
|
Date: Wed, 15 May 2024 06:20:54 +0200
|
|
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA=20Fix=20python=203.13=20tests?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---
|
|
tests/test_extensions/test_ext_autodoc.py | 2 +-
|
|
.../test_ext_autodoc_configs.py | 31 +++++++++++++------
|
|
2 files changed, 22 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/tests/test_extensions/test_ext_autodoc.py b/tests/test_extensions/test_ext_autodoc.py
|
|
index a88d111bdb3..5a2e91cb5e9 100644
|
|
--- a/tests/test_extensions/test_ext_autodoc.py
|
|
+++ b/tests/test_extensions/test_ext_autodoc.py
|
|
@@ -838,7 +838,7 @@ def test_autodoc_special_members(app):
|
|
"special-members": None,
|
|
}
|
|
if sys.version_info >= (3, 13, 0, 'alpha', 5):
|
|
- options["exclude-members"] = "__static_attributes__"
|
|
+ options["exclude-members"] = "__static_attributes__,__firstlineno__"
|
|
actual = do_autodoc(app, 'class', 'target.Class', options)
|
|
assert list(filter(lambda l: '::' in l, actual)) == [
|
|
'.. py:class:: Class(arg)',
|
|
diff --git a/tests/test_extensions/test_ext_autodoc_configs.py b/tests/test_extensions/test_ext_autodoc_configs.py
|
|
index 6c2af5a0652..1262b15162b 100644
|
|
--- a/tests/test_extensions/test_ext_autodoc_configs.py
|
|
+++ b/tests/test_extensions/test_ext_autodoc_configs.py
|
|
@@ -679,6 +679,10 @@ def test_autodoc_typehints_signature(app):
|
|
type_o = "~typing.Any | None"
|
|
else:
|
|
type_o = "~typing.Any"
|
|
+ if sys.version_info[:2] >= (3, 13):
|
|
+ type_ppp = "pathlib._local.PurePosixPath"
|
|
+ else:
|
|
+ type_ppp = "pathlib.PurePosixPath"
|
|
|
|
options = {"members": None,
|
|
"undoc-members": None}
|
|
@@ -703,7 +707,7 @@ def test_autodoc_typehints_signature(app):
|
|
'',
|
|
'.. py:data:: CONST3',
|
|
' :module: target.typehints',
|
|
- ' :type: ~pathlib.PurePosixPath',
|
|
+ f' :type: ~{type_ppp}',
|
|
" :value: PurePosixPath('/a/b/c')",
|
|
'',
|
|
' docstring',
|
|
@@ -726,7 +730,7 @@ def test_autodoc_typehints_signature(app):
|
|
'',
|
|
' .. py:attribute:: Math.CONST3',
|
|
' :module: target.typehints',
|
|
- ' :type: ~pathlib.PurePosixPath',
|
|
+ f' :type: ~{type_ppp}',
|
|
" :value: PurePosixPath('/a/b/c')",
|
|
'',
|
|
'',
|
|
@@ -748,7 +752,7 @@ def test_autodoc_typehints_signature(app):
|
|
'',
|
|
' .. py:property:: Math.path',
|
|
' :module: target.typehints',
|
|
- ' :type: ~pathlib.PurePosixPath',
|
|
+ f' :type: ~{type_ppp}',
|
|
'',
|
|
'',
|
|
' .. py:property:: Math.prop',
|
|
@@ -773,7 +777,7 @@ def test_autodoc_typehints_signature(app):
|
|
'',
|
|
' docstring',
|
|
'',
|
|
- " alias of TypeVar('T', bound=\\ :py:class:`~pathlib.PurePosixPath`)",
|
|
+ f" alias of TypeVar('T', bound=\\ :py:class:`~{type_ppp}`)",
|
|
'',
|
|
'',
|
|
'.. py:function:: complex_func(arg1: str, arg2: List[int], arg3: Tuple[int, '
|
|
@@ -802,6 +806,10 @@ def test_autodoc_typehints_signature(app):
|
|
@pytest.mark.sphinx('html', testroot='ext-autodoc',
|
|
confoverrides={'autodoc_typehints': "none"})
|
|
def test_autodoc_typehints_none(app):
|
|
+ if sys.version_info[:2] >= (3, 13):
|
|
+ type_ppp = "pathlib._local.PurePosixPath"
|
|
+ else:
|
|
+ type_ppp = "pathlib.PurePosixPath"
|
|
options = {"members": None,
|
|
"undoc-members": None}
|
|
actual = do_autodoc(app, 'module', 'target.typehints', options)
|
|
@@ -887,7 +895,7 @@ def test_autodoc_typehints_none(app):
|
|
'',
|
|
' docstring',
|
|
'',
|
|
- " alias of TypeVar('T', bound=\\ :py:class:`~pathlib.PurePosixPath`)",
|
|
+ f" alias of TypeVar('T', bound=\\ :py:class:`~{type_ppp}`)",
|
|
'',
|
|
'',
|
|
'.. py:function:: complex_func(arg1, arg2, arg3=None, *args, **kwargs)',
|
|
@@ -1417,7 +1425,10 @@ def test_autodoc_typehints_format_fully_qualified(app):
|
|
type_o = "typing.Any | None"
|
|
else:
|
|
type_o = "typing.Any"
|
|
-
|
|
+ if sys.version_info[:2] >= (3, 13):
|
|
+ type_ppp = "pathlib._local.PurePosixPath"
|
|
+ else:
|
|
+ type_ppp = "pathlib.PurePosixPath"
|
|
options = {"members": None,
|
|
"undoc-members": None}
|
|
actual = do_autodoc(app, 'module', 'target.typehints', options)
|
|
@@ -1441,7 +1452,7 @@ def test_autodoc_typehints_format_fully_qualified(app):
|
|
'',
|
|
'.. py:data:: CONST3',
|
|
' :module: target.typehints',
|
|
- ' :type: pathlib.PurePosixPath',
|
|
+ f' :type: {type_ppp}',
|
|
" :value: PurePosixPath('/a/b/c')",
|
|
'',
|
|
' docstring',
|
|
@@ -1464,7 +1475,7 @@ def test_autodoc_typehints_format_fully_qualified(app):
|
|
'',
|
|
' .. py:attribute:: Math.CONST3',
|
|
' :module: target.typehints',
|
|
- ' :type: pathlib.PurePosixPath',
|
|
+ f' :type: {type_ppp}',
|
|
" :value: PurePosixPath('/a/b/c')",
|
|
'',
|
|
'',
|
|
@@ -1486,7 +1497,7 @@ def test_autodoc_typehints_format_fully_qualified(app):
|
|
'',
|
|
' .. py:property:: Math.path',
|
|
' :module: target.typehints',
|
|
- ' :type: pathlib.PurePosixPath',
|
|
+ f' :type: {type_ppp}',
|
|
'',
|
|
'',
|
|
' .. py:property:: Math.prop',
|
|
@@ -1511,7 +1522,7 @@ def test_autodoc_typehints_format_fully_qualified(app):
|
|
'',
|
|
' docstring',
|
|
'',
|
|
- " alias of TypeVar('T', bound=\\ :py:class:`pathlib.PurePosixPath`)",
|
|
+ f" alias of TypeVar('T', bound=\\ :py:class:`{type_ppp}`)",
|
|
'',
|
|
'',
|
|
'.. py:function:: complex_func(arg1: str, arg2: List[int], arg3: Tuple[int, '
|