chore(env): spread out python manager

Author: abn

src/poetry/console/commands/init.py

@@ -17,7 +17,7 @@
 from poetry.console.commands.command import Command
 from poetry.console.commands.env_command import EnvCommand
 from poetry.utils.dependency_specification import RequirementsParser
-from poetry.utils.env.python_manager import Python
+from poetry.utils.env.python import Python
 
 
 if TYPE_CHECKING:

src/poetry/utils/env/__init__.py

@@ -11,9 +11,6 @@
 from poetry.utils.env.exceptions import EnvCommandError
 from poetry.utils.env.exceptions import EnvError
 from poetry.utils.env.exceptions import IncorrectEnvError
-from poetry.utils.env.exceptions import InvalidCurrentPythonVersionError
-from poetry.utils.env.exceptions import NoCompatiblePythonVersionFoundError
-from poetry.utils.env.exceptions import PythonVersionNotFoundError
 from poetry.utils.env.generic_env import GenericEnv
 from poetry.utils.env.mock_env import MockEnv
 from poetry.utils.env.null_env import NullEnv
@@ -102,11 +99,8 @@ def build_environment(
     "EnvManager",
     "GenericEnv",
     "IncorrectEnvError",
-    "InvalidCurrentPythonVersionError",
     "MockEnv",
-    "NoCompatiblePythonVersionFoundError",
     "NullEnv",
-    "PythonVersionNotFoundError",
     "SitePackages",
     "SystemEnv",
     "VirtualEnv",

src/poetry/utils/env/env_manager.py

@@ -24,11 +24,11 @@
 from poetry.utils._compat import encode
 from poetry.utils.env.exceptions import EnvCommandError
 from poetry.utils.env.exceptions import IncorrectEnvError
-from poetry.utils.env.exceptions import InvalidCurrentPythonVersionError
-from poetry.utils.env.exceptions import NoCompatiblePythonVersionFoundError
-from poetry.utils.env.exceptions import PythonVersionNotFoundError
 from poetry.utils.env.generic_env import GenericEnv
-from poetry.utils.env.python_manager import Python
+from poetry.utils.env.python import Python
+from poetry.utils.env.python.exceptions import InvalidCurrentPythonVersionError
+from poetry.utils.env.python.exceptions import NoCompatiblePythonVersionFoundError
+from poetry.utils.env.python.exceptions import PythonVersionNotFoundError
 from poetry.utils.env.script_strings import GET_ENV_PATH_ONELINER
 from poetry.utils.env.script_strings import GET_PYTHON_VERSION_ONELINER
 from poetry.utils.env.system_env import SystemEnv

src/poetry/utils/env/exceptions.py

@@ -31,39 +31,3 @@ def __init__(self, e: CalledProcessError) -> None:
         if e.stderr:
             message_parts.append(f"Error output:\n{decode(e.stderr)}")
         super().__init__("\n\n".join(message_parts))
-
-
-class PythonVersionNotFoundError(EnvError):
-    def __init__(self, expected: str) -> None:
-        super().__init__(f"Could not find the python executable {expected}")
-
-
-class NoCompatiblePythonVersionFoundError(EnvError):
-    def __init__(self, expected: str, given: str | None = None) -> None:
-        if given:
-            message = (
-                f"The specified Python version ({given}) "
-                f"is not supported by the project ({expected}).\n"
-                "Please choose a compatible version "
-                "or loosen the python constraint specified "
-                "in the pyproject.toml file."
-            )
-        else:
-            message = (
-                "Poetry was unable to find a compatible version. "
-                "If you have one, you can explicitly use it "
-                'via the "env use" command.'
-            )
-
-        super().__init__(message)
-
-
-class InvalidCurrentPythonVersionError(EnvError):
-    def __init__(self, expected: str, given: str) -> None:
-        message = (
-            f"Current Python version ({given}) "
-            f"is not allowed by the project ({expected}).\n"
-            'Please change python executable via the "env use" command.'
-        )
-
-        super().__init__(message)

src/poetry/utils/env/python/__init__.py

@@ -0,0 +1,6 @@
+from __future__ import annotations
+
+from poetry.utils.env.python.manager import Python
+
+
+__all__ = ["Python"]

src/poetry/utils/env/python/exceptions.py

@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+
+class PythonVersionError(Exception):
+    pass
+
+
+class PythonVersionNotFoundError(PythonVersionError):
+    def __init__(self, expected: str) -> None:
+        super().__init__(f"Could not find the python executable {expected}")
+
+
+class NoCompatiblePythonVersionFoundError(PythonVersionError):
+    def __init__(self, expected: str, given: str | None = None) -> None:
+        if given:
+            message = (
+                f"The specified Python version ({given}) "
+                f"is not supported by the project ({expected}).\n"
+                "Please choose a compatible version "
+                "or loosen the python constraint specified "
+                "in the pyproject.toml file."
+            )
+        else:
+            message = (
+                "Poetry was unable to find a compatible version. "
+                "If you have one, you can explicitly use it "
+                'via the "env use" command.'
+            )
+
+        super().__init__(message)
+
+
+class InvalidCurrentPythonVersionError(PythonVersionError):
+    def __init__(self, expected: str, given: str) -> None:
+        message = (
+            f"Current Python version ({given}) "
+            f"is not allowed by the project ({expected}).\n"
+            'Please change python executable via the "env use" command.'
+        )
+
+        super().__init__(message)

src/poetry/utils/env/python_manager.py renamed to src/poetry/utils/env/python/manager.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import contextlib
-import shutil
 import sys
 
 from functools import cached_property
@@ -18,30 +17,17 @@
 from cleo.io.outputs.output import Verbosity
 from poetry.core.constraints.version import Version
 
-from poetry.utils.env.exceptions import NoCompatiblePythonVersionFoundError
+from poetry.utils.env.python.exceptions import NoCompatiblePythonVersionFoundError
+from poetry.utils.env.python.providers import ShutilWhichPythonProvider
 
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable
-
     from cleo.io.io import IO
-    from typing_extensions import Self
 
     from poetry.config.config import Config
     from poetry.poetry import Poetry
 
 
-class ShutilWhichPythonProvider(findpython.BaseProvider):  # type: ignore[misc]
-    @classmethod
-    def create(cls) -> Self | None:
-        return cls()
-
-    def find_pythons(self) -> Iterable[findpython.PythonVersion]:
-        if path := shutil.which("python"):
-            return [findpython.PythonVersion(executable=Path(path))]
-        return []
-
-
 class Python:
     @overload
     def __init__(self, *, python: findpython.PythonVersion) -> None: ...

src/poetry/utils/env/python/providers.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+import shutil
+
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+import findpython
+
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+    from typing_extensions import Self
+
+
+class ShutilWhichPythonProvider(findpython.BaseProvider):  # type: ignore[misc]
+    @classmethod
+    def create(cls) -> Self | None:
+        return cls()
+
+    def find_pythons(self) -> Iterable[findpython.PythonVersion]:
+        if path := shutil.which("python"):
+            return [findpython.PythonVersion(executable=Path(path))]
+        return []

tests/conftest.py

@@ -45,7 +45,7 @@
 from poetry.utils.env import MockEnv
 from poetry.utils.env import SystemEnv
 from poetry.utils.env import VirtualEnv
-from poetry.utils.env.python_manager import Python
+from poetry.utils.env.python import Python
 from poetry.utils.password_manager import PoetryKeyring
 from tests.helpers import MOCK_DEFAULT_GIT_REVISION
 from tests.helpers import TestLocker
@@ -906,7 +906,7 @@ def register(
 
         if make_system:
             mocker.patch(
-                "poetry.utils.env.python_manager.Python.get_system_python",
+                "poetry.utils.env.python.Python.get_system_python",
                 return_value=Python(python=python),
             )
             mocked_pythons_version_map[""] = python
@@ -959,6 +959,6 @@ def with_mocked_findpython(
 @pytest.fixture
 def with_no_active_python(mocker: MockerFixture) -> MagicMock:
     return mocker.patch(
-        "poetry.utils.env.python_manager.Python.get_active_python",
+        "poetry.utils.env.python.Python.get_active_python",
         return_value=None,
     )

tests/types.py

@@ -27,7 +27,7 @@
     from poetry.poetry import Poetry
     from poetry.repositories.legacy_repository import LegacyRepository
     from poetry.utils.env import Env
-    from poetry.utils.env.python_manager import Python
+    from poetry.utils.env.python import Python
     from tests.repositories.fixtures.distribution_hashes import DistributionHash
 
     HTTPrettyResponse = tuple[int, dict[str, Any], bytes]  # status code, headers, body