Skip to content

Commit bf18863

Browse files
isidoremander11blade290susanfung
committed
- 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>
1 parent 60e019a commit bf18863

10 files changed

Lines changed: 5 additions & 5 deletions

File tree

approvaltests/integrations/__init__.py

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""Approvaltests.integrations.pytest module."""
File renamed without changes.
File renamed without changes.
File renamed without changes.

approvaltests/namer/stack_frame_namer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from approvaltests.namer.namer_base import NamerBase
88
from approvaltests.approval_exception import FrameNotFound
99
from approval_utilities.utilities.stack_frame_utilities import get_class_name_for_frame
10-
from approvaltests.pytest.pytest_config import PytestConfig
10+
from approvaltests.integrations.pytest.pytest_config import PytestConfig
1111

1212

1313
class StackFrameNamer(NamerBase):

approvaltests/pytest/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

setup_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def do_the_setup(package_name, package_description, required, extra_requires):
3333
package_data={"approvaltests": ["reporters/reporters.json"]},
3434
entry_points={
3535
"pytest11": [
36-
"approvaltests_pytest = approvaltests.pytest.pytest_plugin",
36+
"approvaltests_pytest = approvaltests.integrations.pytest.pytest_plugin",
3737
],
3838
},
3939
install_requires=required,

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pytest
44

55
# The next line registers the plugin
6-
from approvaltests.pytest.pytest_plugin import pytest_configure
6+
from approvaltests.integrations.pytest.pytest_plugin import pytest_configure
77

88

99
# begin-snippet: conftest_pytest_session_scoped

tests/integrations/pytest/test_namer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22

33
from approvaltests.approvals import get_default_namer, verify
4-
from approvaltests.pytest.py_test_namer import PyTestNamer
4+
from approvaltests.integrations.pytest.py_test_namer import PyTestNamer
55

66

77
def test_basic_approval():

0 commit comments

Comments
 (0)