Rename pythonpath plugin to python_path

Fix pytest-dev#9636.
bluetech · Feb 9, 2022 · f30e4de · f30e4de
1 parent 04a6f52
commit f30e4de
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/changelog/9636.bugfix.rst b/changelog/9636.bugfix.rst
@@ -0,0 +1 @@
+The ``pythonpath`` plugin was renamed to ``python_path``. This avoids a conflict with the ``pytest-pythonpath`` plugin.
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -254,7 +254,7 @@ def directory_arg(path: str, optname: str) -> str:
     "warnings",
     "logging",
     "reports",
-    "pythonpath",
+    "python_path",
     *(["unraisableexception", "threadexception"] if sys.version_info >= (3, 8) else []),
     "faulthandler",
 )

diff --git a/src/_pytest/pythonpath.py → src/_pytest/python_path.py b/src/_pytest/pythonpath.py → src/_pytest/python_path.py
diff --git a/testing/test_pythonpath.py → testing/test_python_path.py b/testing/test_pythonpath.py → testing/test_python_path.py
@@ -81,7 +81,7 @@ def test_no_ini(pytester: Pytester, file_structure) -> None:
 
 
 def test_clean_up(pytester: Pytester) -> None:
-    """Test that the pythonpath plugin cleans up after itself."""
+    """Test that the plugin cleans up after itself."""
     # This is tough to test behaviorly because the cleanup really runs last.
     # So the test make several implementation assumptions:
     # - Cleanup is done in pytest_unconfigure().