Integrate with pyenv

news/36.feature

@@ -0,0 +1 @@
+Use the pyenv interperter value if pyenv is installed.

pdm/cli/actions.py

@@ -467,7 +467,7 @@ def do_use(project: Project, python: str) -> None:
         )
     )
 
-    project.config["python"] = Path(python_path).as_posix()
+    project.config["python.path"] = Path(python_path).as_posix()
     project.config.save_config()
 
 

pdm/context.py

@@ -27,10 +27,6 @@ def __init__(self):
     def init(self, project):
         self.project = project
 
-    @property
-    def initialized(self) -> bool:
-        return self._initialized
-
     @property
     def cache_dir(self) -> Path:
         return Path(self.project.config.get("cache_dir"))

pdm/models/environment.py

@@ -26,6 +26,7 @@
     get_python_version,
 )
 from pythonfinder import Finder
+from pythonfinder.environment import PYENV_INSTALLED, PYENV_ROOT
 from vistir.contextmanagers import temp_environ
 from vistir.path import normalize_path
 
@@ -84,13 +85,15 @@ def __init__(self, python_requires: PySpecSet, config: Config) -> None:
     @cached_property
     def python_executable(self) -> str:
         """Get the Python interpreter path."""
-        if self.config["python"]:
-            path = self.config["python"]
+        if self.config.get("python.path"):
+            path = self.config["python.path"]
             try:
                 get_python_version(path)
                 return path
             except Exception:
                 pass
+        if PYENV_INSTALLED and self.config.get("python.use_pyenv", True):
+            return os.path.join(PYENV_ROOT, "shims", "python")
 
         # First try what `python` refers to.
         path = shutil.which("python")
@@ -113,7 +116,7 @@ def python_executable(self) -> str:
                     context.io.green(path), version
                 )
             )
-            self.config["python"] = Path(path).as_posix()
+            self.config["python.path"] = Path(path).as_posix()
             self.config.save_config()
             return path
         raise NoPythonVersion(

pdm/project/config.py

@@ -10,8 +10,6 @@
 class Config(MutableMapping):
     DEFAULT_CONFIG = {
         "cache_dir": appdirs.user_cache_dir("pdm"),
-        "python": None,
-        "packages_path": None,
     }
 
     def __init__(self, project_root: Path):
@@ -20,7 +18,7 @@ def __init__(self, project_root: Path):
         self._dirty = {}
 
         self._project_config_file = self.project_root / ".pdm.toml"
-        self._global_config_file = Path(appdirs.user_config_dir("pdm")) / ".pdm.toml"
+        self._global_config_file = Path(appdirs.user_config_dir("pdm")) / "config.toml"
         self._project_config = self.load_config(self._project_config_file)
         self._global_config = self.load_config(self._global_config_file)
         # First load user config, then project config
@@ -67,8 +65,6 @@ def __getitem__(self, key: str) -> Any:
             raise NoConfigError(key) from None
 
     def __setitem__(self, key: str, value: Any) -> None:
-        if key not in self.DEFAULT_CONFIG:
-            raise NoConfigError(key)
         self._dirty[key] = value
         self._data[key] = value
 

tests/test_project.py

@@ -0,0 +1,13 @@
+import os
+
+
+def test_project_python_with_pyenv_support(project, mocker):
+    from pythonfinder.environment import PYENV_ROOT
+
+    pyenv_python = os.path.join(PYENV_ROOT, "shims", "python")
+
+    mocker.patch("pdm.models.environment.PYENV_INSTALLED", True)
+    assert project.environment.python_executable == pyenv_python
+
+    project.config["python.use_pyenv"] = False
+    assert project.environment.python_executable != pyenv_python