- F Moved pytest into integrations/pytest

Co-Authored-By: Matt Anderson <matthew.anderson11@gmail.com> Co-Authored-By: Joss Hufnagel <43077216+blade290@users.noreply.github.com> Co-Authored-By: Susan Fung <38925660+susanfung@users.noreply.github.com>
approvals · Jul 7, 2024 · bf18863 · bf18863
1 parent 60e019a
commit bf18863
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 5 deletions.
diff --git a/approvaltests/integrations/__init__.py b/approvaltests/integrations/__init__.py
diff --git a/approvaltests/integrations/pytest/__init__.py b/approvaltests/integrations/pytest/__init__.py
@@ -0,0 +1 @@
+"""Approvaltests.integrations.pytest module."""
diff --git a/approvaltests/pytest/py_test_namer.py → ...ests/integrations/pytest/py_test_namer.py b/approvaltests/pytest/py_test_namer.py → ...ests/integrations/pytest/py_test_namer.py
diff --git a/approvaltests/pytest/pytest_config.py → ...ests/integrations/pytest/pytest_config.py b/approvaltests/pytest/pytest_config.py → ...ests/integrations/pytest/pytest_config.py
diff --git a/approvaltests/pytest/pytest_plugin.py → ...ests/integrations/pytest/pytest_plugin.py b/approvaltests/pytest/pytest_plugin.py → ...ests/integrations/pytest/pytest_plugin.py
diff --git a/approvaltests/namer/stack_frame_namer.py b/approvaltests/namer/stack_frame_namer.py
@@ -7,7 +7,7 @@
 from approvaltests.namer.namer_base import NamerBase
 from approvaltests.approval_exception import FrameNotFound
 from approval_utilities.utilities.stack_frame_utilities import get_class_name_for_frame
-from approvaltests.pytest.pytest_config import PytestConfig
+from approvaltests.integrations.pytest.pytest_config import PytestConfig
 
 
 class StackFrameNamer(NamerBase):

diff --git a/approvaltests/pytest/__init__.py b/approvaltests/pytest/__init__.py
diff --git a/setup_utils.py b/setup_utils.py
@@ -33,7 +33,7 @@ def do_the_setup(package_name, package_description, required, extra_requires):
         package_data={"approvaltests": ["reporters/reporters.json"]},
         entry_points={
             "pytest11": [
-                "approvaltests_pytest = approvaltests.pytest.pytest_plugin",
+                "approvaltests_pytest = approvaltests.integrations.pytest.pytest_plugin",
             ],
         },
         install_requires=required,

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -3,7 +3,7 @@
 import pytest
 
 # The next line registers the plugin
-from approvaltests.pytest.pytest_plugin import pytest_configure
+from approvaltests.integrations.pytest.pytest_plugin import pytest_configure
 
 
 # begin-snippet: conftest_pytest_session_scoped

diff --git a/tests/integrations/pytest/test_namer.py b/tests/integrations/pytest/test_namer.py
@@ -1,7 +1,7 @@
 import os
 
 from approvaltests.approvals import get_default_namer, verify
-from approvaltests.pytest.py_test_namer import PyTestNamer
+from approvaltests.integrations.pytest.py_test_namer import PyTestNamer
 
 
 def test_basic_approval():