diff --git a/pyproject.toml b/pyproject.toml index 2baf5410ab..42556be6a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -228,12 +228,16 @@ module = [ # tests/test_directives "tests.test_directives.test_directive_code", "tests.test_directives.test_directives_no_typesetting", + # tests/test_ext_autodoc + "tests.test_ext_autodoc.test_ext_autodoc_autoclass", + # tests/test_ext_autosummary + "tests.test_ext_autosummary.test_ext_autosummary_imports", + # tests/test_ext_intersphinx + "tests.test_ext_intersphinx.test_ext_intersphinx_cache", + # tests/test_ext_napoleon + "tests.test_ext_napoleon.test_ext_napoleon", # tests/test_extensions - "tests.test_extensions.test_ext_autodoc_autoclass", - "tests.test_extensions.test_ext_autosummary_imports", - "tests.test_extensions.test_ext_intersphinx_cache", "tests.test_extensions.test_ext_math", - "tests.test_extensions.test_ext_napoleon", # tests/test_markup "tests.test_markup.test_markup", # tests/test_theming @@ -269,16 +273,20 @@ module = [ "tests.test_domains.test_domain_std", # tests/test_environment "tests.test_environment.test_environment_toctree", + # tests/test_ext_autodoc + "tests.test_ext_autodoc.test_ext_autodoc", + "tests.test_ext_autodoc.test_ext_autodoc_events", + "tests.test_ext_autodoc.test_ext_autodoc_mock", + # tests/test_ext_autosummary + "tests.test_ext_autosummary.test_ext_autosummary", + # tests/test_ext_intersphinx + "tests.test_ext_intersphinx.test_ext_intersphinx", + # tests/test_ext_napoleon + "tests.test_ext_napoleon.test_ext_napoleon_docstring", # tests/test_extensions "tests.test_extensions.test_ext_apidoc", - "tests.test_extensions.test_ext_autodoc", - "tests.test_extensions.test_ext_autodoc_events", - "tests.test_extensions.test_ext_autodoc_mock", - "tests.test_extensions.test_ext_autosummary", "tests.test_extensions.test_ext_doctest", "tests.test_extensions.test_ext_inheritance_diagram", - "tests.test_extensions.test_ext_intersphinx", - "tests.test_extensions.test_ext_napoleon_docstring", # tests/test_intl "tests.test_intl.test_intl", # tests/test_transforms diff --git a/tests/test_ext_autodoc/__init__.py b/tests/test_ext_autodoc/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/test_extensions/autodoc_util.py b/tests/test_ext_autodoc/autodoc_util.py similarity index 100% rename from tests/test_extensions/autodoc_util.py rename to tests/test_ext_autodoc/autodoc_util.py diff --git a/tests/test_extensions/test_ext_autodoc.py b/tests/test_ext_autodoc/test_ext_autodoc.py similarity index 99% rename from tests/test_extensions/test_ext_autodoc.py rename to tests/test_ext_autodoc/test_ext_autodoc.py index 48259039bd..b7305fa320 100644 --- a/tests/test_extensions/test_ext_autodoc.py +++ b/tests/test_ext_autodoc/test_ext_autodoc.py @@ -33,7 +33,7 @@ from sphinx.ext.autodoc._sentinels import ALL from sphinx.ext.autodoc.directive import DocumenterBridge from sphinx.ext.autodoc.importer import _parse_name -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc try: # Enable pyximport to test cython module diff --git a/tests/test_extensions/test_ext_autodoc_autoattribute.py b/tests/test_ext_autodoc/test_ext_autodoc_autoattribute.py similarity index 98% rename from tests/test_extensions/test_ext_autodoc_autoattribute.py rename to tests/test_ext_autodoc/test_ext_autodoc_autoattribute.py index 878f5b6e31..84320b66ec 100644 --- a/tests/test_extensions/test_ext_autodoc_autoattribute.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_autoattribute.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING import pytest -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp diff --git a/tests/test_extensions/test_ext_autodoc_autoclass.py b/tests/test_ext_autodoc/test_ext_autodoc_autoclass.py similarity index 99% rename from tests/test_extensions/test_ext_autodoc_autoclass.py rename to tests/test_ext_autodoc/test_ext_autodoc_autoclass.py index 3cb062432a..d3918d0d0e 100644 --- a/tests/test_extensions/test_ext_autodoc_autoclass.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_autoclass.py @@ -10,7 +10,7 @@ import typing import pytest -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if typing.TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp diff --git a/tests/test_extensions/test_ext_autodoc_autodata.py b/tests/test_ext_autodoc/test_ext_autodoc_autodata.py similarity index 98% rename from tests/test_extensions/test_ext_autodoc_autodata.py rename to tests/test_ext_autodoc/test_ext_autodoc_autodata.py index 1474d70dc5..0c81f3f846 100644 --- a/tests/test_extensions/test_ext_autodoc_autodata.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_autodata.py @@ -12,7 +12,7 @@ import pytest from sphinx.testing.util import SphinxTestApp -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp diff --git a/tests/test_extensions/test_ext_autodoc_autofunction.py b/tests/test_ext_autodoc/test_ext_autodoc_autofunction.py similarity index 99% rename from tests/test_extensions/test_ext_autodoc_autofunction.py rename to tests/test_ext_autodoc/test_ext_autodoc_autofunction.py index 946d051d57..27108c6881 100644 --- a/tests/test_extensions/test_ext_autodoc_autofunction.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_autofunction.py @@ -15,7 +15,7 @@ if TYPE_CHECKING: import pytest -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc @pytest.mark.sphinx('html', testroot='ext-autodoc') diff --git a/tests/test_extensions/test_ext_autodoc_automodule.py b/tests/test_ext_autodoc/test_ext_autodoc_automodule.py similarity index 99% rename from tests/test_extensions/test_ext_autodoc_automodule.py rename to tests/test_ext_autodoc/test_ext_autodoc_automodule.py index 9404e01b73..256f9f4e90 100644 --- a/tests/test_extensions/test_ext_autodoc_automodule.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_automodule.py @@ -12,7 +12,7 @@ import typing import pytest -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if typing.TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp diff --git a/tests/test_extensions/test_ext_autodoc_autoproperty.py b/tests/test_ext_autodoc/test_ext_autodoc_autoproperty.py similarity index 97% rename from tests/test_extensions/test_ext_autodoc_autoproperty.py rename to tests/test_ext_autodoc/test_ext_autodoc_autoproperty.py index 6698d4c8fc..6579e29614 100644 --- a/tests/test_extensions/test_ext_autodoc_autoproperty.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_autoproperty.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING import pytest -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp diff --git a/tests/test_extensions/test_ext_autodoc_configs.py b/tests/test_ext_autodoc/test_ext_autodoc_configs.py similarity index 99% rename from tests/test_extensions/test_ext_autodoc_configs.py rename to tests/test_ext_autodoc/test_ext_autodoc_configs.py index bde2d0234c..6f8cfc27c5 100644 --- a/tests/test_extensions/test_ext_autodoc_configs.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_configs.py @@ -11,7 +11,7 @@ import pytest from sphinx.testing import restructuredtext -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if TYPE_CHECKING: from collections.abc import Iterator diff --git a/tests/test_extensions/test_ext_autodoc_events.py b/tests/test_ext_autodoc/test_ext_autodoc_events.py similarity index 98% rename from tests/test_extensions/test_ext_autodoc_events.py rename to tests/test_ext_autodoc/test_ext_autodoc_events.py index b0086c888e..c1bbf55808 100644 --- a/tests/test_extensions/test_ext_autodoc_events.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_events.py @@ -8,7 +8,7 @@ import pytest from sphinx.ext.autodoc import between, cut_lines -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp diff --git a/tests/test_extensions/test_ext_autodoc_importer.py b/tests/test_ext_autodoc/test_ext_autodoc_importer.py similarity index 100% rename from tests/test_extensions/test_ext_autodoc_importer.py rename to tests/test_ext_autodoc/test_ext_autodoc_importer.py diff --git a/tests/test_extensions/test_ext_autodoc_mock.py b/tests/test_ext_autodoc/test_ext_autodoc_mock.py similarity index 100% rename from tests/test_extensions/test_ext_autodoc_mock.py rename to tests/test_ext_autodoc/test_ext_autodoc_mock.py diff --git a/tests/test_extensions/test_ext_autodoc_preserve_defaults.py b/tests/test_ext_autodoc/test_ext_autodoc_preserve_defaults.py similarity index 99% rename from tests/test_extensions/test_ext_autodoc_preserve_defaults.py rename to tests/test_ext_autodoc/test_ext_autodoc_preserve_defaults.py index 8fdc7de79d..e36ce2ade2 100644 --- a/tests/test_extensions/test_ext_autodoc_preserve_defaults.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_preserve_defaults.py @@ -6,7 +6,7 @@ from typing import TYPE_CHECKING import pytest -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp diff --git a/tests/test_extensions/test_ext_autodoc_private_members.py b/tests/test_ext_autodoc/test_ext_autodoc_private_members.py similarity index 98% rename from tests/test_extensions/test_ext_autodoc_private_members.py rename to tests/test_ext_autodoc/test_ext_autodoc_private_members.py index 9c144ea40a..0b9b941cef 100644 --- a/tests/test_extensions/test_ext_autodoc_private_members.py +++ b/tests/test_ext_autodoc/test_ext_autodoc_private_members.py @@ -6,7 +6,7 @@ from typing import TYPE_CHECKING import pytest -from tests.test_extensions.autodoc_util import do_autodoc +from tests.test_ext_autodoc.autodoc_util import do_autodoc if TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp diff --git a/tests/test_extensions/test_ext_autodoc_type_alias_nitpicky.py b/tests/test_ext_autodoc/test_ext_autodoc_type_alias_nitpicky.py similarity index 100% rename from tests/test_extensions/test_ext_autodoc_type_alias_nitpicky.py rename to tests/test_ext_autodoc/test_ext_autodoc_type_alias_nitpicky.py diff --git a/tests/test_ext_autosummary/__init__.py b/tests/test_ext_autosummary/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/test_extensions/test_ext_autosummary.py b/tests/test_ext_autosummary/test_ext_autosummary.py similarity index 100% rename from tests/test_extensions/test_ext_autosummary.py rename to tests/test_ext_autosummary/test_ext_autosummary.py diff --git a/tests/test_extensions/test_ext_autosummary_imports.py b/tests/test_ext_autosummary/test_ext_autosummary_imports.py similarity index 100% rename from tests/test_extensions/test_ext_autosummary_imports.py rename to tests/test_ext_autosummary/test_ext_autosummary_imports.py diff --git a/tests/test_ext_imgconverter/__init__.py b/tests/test_ext_imgconverter/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/test_extensions/test_ext_imgconverter.py b/tests/test_ext_imgconverter/test_ext_imgconverter.py similarity index 100% rename from tests/test_extensions/test_ext_imgconverter.py rename to tests/test_ext_imgconverter/test_ext_imgconverter.py diff --git a/tests/test_extensions/test_ext_imgmockconverter.py b/tests/test_ext_imgconverter/test_ext_imgmockconverter.py similarity index 100% rename from tests/test_extensions/test_ext_imgmockconverter.py rename to tests/test_ext_imgconverter/test_ext_imgmockconverter.py diff --git a/tests/test_ext_intersphinx/__init__.py b/tests/test_ext_intersphinx/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/test_extensions/test_ext_intersphinx.py b/tests/test_ext_intersphinx/test_ext_intersphinx.py similarity index 100% rename from tests/test_extensions/test_ext_intersphinx.py rename to tests/test_ext_intersphinx/test_ext_intersphinx.py diff --git a/tests/test_extensions/test_ext_intersphinx_cache.py b/tests/test_ext_intersphinx/test_ext_intersphinx_cache.py similarity index 100% rename from tests/test_extensions/test_ext_intersphinx_cache.py rename to tests/test_ext_intersphinx/test_ext_intersphinx_cache.py diff --git a/tests/test_ext_napoleon/__init__.py b/tests/test_ext_napoleon/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/test_extensions/ext_napoleon_pep526_data_google.py b/tests/test_ext_napoleon/pep526_data_google.py similarity index 100% rename from tests/test_extensions/ext_napoleon_pep526_data_google.py rename to tests/test_ext_napoleon/pep526_data_google.py diff --git a/tests/test_extensions/ext_napoleon_pep526_data_numpy.py b/tests/test_ext_napoleon/pep526_data_numpy.py similarity index 100% rename from tests/test_extensions/ext_napoleon_pep526_data_numpy.py rename to tests/test_ext_napoleon/pep526_data_numpy.py diff --git a/tests/test_extensions/test_ext_napoleon.py b/tests/test_ext_napoleon/test_ext_napoleon.py similarity index 100% rename from tests/test_extensions/test_ext_napoleon.py rename to tests/test_ext_napoleon/test_ext_napoleon.py diff --git a/tests/test_extensions/test_ext_napoleon_docstring.py b/tests/test_ext_napoleon/test_ext_napoleon_docstring.py similarity index 99% rename from tests/test_extensions/test_ext_napoleon_docstring.py rename to tests/test_ext_napoleon/test_ext_napoleon_docstring.py index a6e9820e5c..62e103d6a1 100644 --- a/tests/test_extensions/test_ext_napoleon_docstring.py +++ b/tests/test_ext_napoleon/test_ext_napoleon_docstring.py @@ -25,8 +25,8 @@ from sphinx.ext.napoleon.docstring import ( ) from sphinx.testing.util import etree_parse -from tests.test_extensions.ext_napoleon_pep526_data_google import PEP526GoogleClass -from tests.test_extensions.ext_napoleon_pep526_data_numpy import PEP526NumpyClass +from tests.test_ext_napoleon.pep526_data_google import PEP526GoogleClass +from tests.test_ext_napoleon.pep526_data_numpy import PEP526NumpyClass if TYPE_CHECKING: from sphinx.testing.util import SphinxTestApp