Skip to content

Commit 453bcb1

Browse files
bluetechpytestbot
authored andcommittedFeb 9, 2022
[7.0.x] Rename pythonpath plugin to python_path
1 parent a24c78b commit 453bcb1

File tree

5 files changed

+4
-3
lines changed

5 files changed

+4
-3
lines changed
 

‎changelog/9636.bugfix.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The ``pythonpath`` plugin was renamed to ``python_path``. This avoids a conflict with the ``pytest-pythonpath`` plugin.

‎src/_pytest/config/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def directory_arg(path: str, optname: str) -> str:
255255
"warnings",
256256
"logging",
257257
"reports",
258-
"pythonpath",
258+
"python_path",
259259
*(["unraisableexception", "threadexception"] if sys.version_info >= (3, 8) else []),
260260
"faulthandler",
261261
)
File renamed without changes.

‎testing/test_config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@ def pytest_load_initial_conftests(self):
12751275
("_pytest.config", "nonwrapper"),
12761276
(m.__module__, "nonwrapper"),
12771277
("_pytest.legacypath", "nonwrapper"),
1278-
("_pytest.pythonpath", "nonwrapper"),
1278+
("_pytest.python_path", "nonwrapper"),
12791279
("_pytest.capture", "wrapper"),
12801280
("_pytest.warnings", "wrapper"),
12811281
]

‎testing/test_pythonpath.py ‎testing/test_python_path.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def test_no_ini(pytester: Pytester, file_structure) -> None:
8181

8282

8383
def test_clean_up(pytester: Pytester) -> None:
84-
"""Test that the pythonpath plugin cleans up after itself."""
84+
"""Test that the plugin cleans up after itself."""
8585
# This is tough to test behaviorly because the cleanup really runs last.
8686
# So the test make several implementation assumptions:
8787
# - Cleanup is done in pytest_unconfigure().

0 commit comments

Comments
 (0)
Please sign in to comment.