Clean up after dropping Python 3.6

This commit is contained in:
Adam Turner
2022-04-17 04:01:17 +01:00
parent 51927bb6e4
commit 7649eb1505
23 changed files with 95 additions and 122 deletions

View File

@@ -661,7 +661,7 @@ def test_mocked_module_imports(app, warning):
@pytest.mark.sphinx('html', testroot='ext-autodoc',
confoverrides={'autodoc_typehints': "signature"})
def test_autodoc_typehints_signature(app):
if sys.version_info < (3, 11):
if sys.version_info[:2] <= (3, 10):
type_o = "~typing.Optional[~typing.Any]"
else:
type_o = "~typing.Any"
@@ -1399,7 +1399,7 @@ def test_autodoc_typehints_description_and_type_aliases(app):
@pytest.mark.sphinx('html', testroot='ext-autodoc',
confoverrides={'autodoc_typehints_format': "fully-qualified"})
def test_autodoc_typehints_format_fully_qualified(app):
if sys.version_info < (3, 11):
if sys.version_info[:2] <= (3, 10):
type_o = "typing.Optional[typing.Any]"
else:
type_o = "typing.Any"