Integrate with pyenv

.github/workflows/.ci.yml

@@ -38,4 +38,5 @@ jobs:
           pdm install -d
       - name: Test
         run: |
+          rm .pdm.toml
           python -m pdm run pytest -n auto --cov pdm --cov-config=setup.cfg tests

news/36.feature

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

pdm/builders/wheel.py

@@ -12,12 +12,12 @@
 
 from pip_shims import shims
 from pkg_resources import safe_name, safe_version, to_filename
+from vistir.path import normalize_path
 
 from pdm.builders.base import Builder
 from pdm.context import context
 from pdm.exceptions import WheelBuildError
 from pdm.utils import cached_property, get_abi_tag
-from vistir.path import normalize_path
 
 WHEEL_FILE_FORMAT = """\
 Wheel-Version: 1.0

pdm/cli/actions.py

@@ -4,12 +4,12 @@
 from pathlib import Path
 from typing import Dict, Iterable, Optional, Sequence
 
-from pkg_resources import safe_name
-
 import click
 import halo
 import pythonfinder
 import tomlkit
+from pkg_resources import safe_name
+
 from pdm.builders import SdistBuilder, WheelBuilder
 from pdm.context import context
 from pdm.exceptions import NoPythonVersion, ProjectError
@@ -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/cli/commands.py

@@ -4,6 +4,7 @@
 import click
 from click._compat import term_len
 from click.formatting import HelpFormatter, iter_rows, measure_table, wrap_text
+
 from pdm.cli import actions
 from pdm.cli.options import (
     dry_run_option,

pdm/cli/options.py

@@ -1,4 +1,5 @@
 import click
+
 from pdm.context import context
 
 

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/exceptions.py

@@ -2,6 +2,7 @@
 
 import click
 from click._compat import get_text_stderr
+
 from pdm.context import context
 
 

pdm/installers.py

@@ -2,24 +2,16 @@
 import subprocess
 from typing import Dict, List, Tuple
 
+import distlib.scripts
+from distlib.wheel import Wheel
 from pip._vendor.pkg_resources import Distribution, EggInfoDistribution, safe_name
 from pip_shims import shims
+from vistir import cd
 
-import distlib.scripts
-from distlib.wheel import Wheel
 from pdm.context import context
 from pdm.models.candidates import Candidate
 from pdm.models.environment import Environment
 from pdm.models.requirements import parse_requirement, strip_extras
-from vistir import cd
-
-SETUPTOOLS_SHIM = (
-    "import setuptools, tokenize;__file__=%r;"
-    "f=getattr(tokenize, 'open', open)(__file__);"
-    "code=f.read().replace('\\r\\n', '\\n');"
-    "f.close();"
-    "exec(compile(code, __file__, 'exec'))"
-)
 
 
 def _is_dist_editable(dist: Distribution) -> bool:

pdm/models/caches.py

@@ -5,10 +5,10 @@
 
 import pip_shims
 from pip._vendor import requests
+from vistir.contextmanagers import open_file
 
 from pdm._types import CandidateInfo
 from pdm.exceptions import CorruptedCacheError
-from vistir.contextmanagers import open_file
 
 if TYPE_CHECKING:
     from pdm.models.candidates import Candidate

pdm/models/candidates.py

@@ -4,12 +4,12 @@
 import warnings
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Sequence, Union
 
-from pip._vendor.pkg_resources import safe_extra
-from pip_shims import shims
-
 from distlib.database import EggInfoDistribution
 from distlib.metadata import Metadata
 from distlib.wheel import Wheel
+from pip._vendor.pkg_resources import safe_extra
+from pip_shims import shims
+
 from pdm.context import context
 from pdm.exceptions import ExtrasError, RequirementError
 from pdm.models.markers import Marker

pdm/models/environment.py

@@ -13,6 +13,10 @@
 from pip._internal.utils import misc
 from pip._vendor import packaging, pkg_resources
 from pip_shims import shims
+from pythonfinder import Finder
+from pythonfinder.environment import PYENV_INSTALLED, PYENV_ROOT
+from vistir.contextmanagers import temp_environ
+from vistir.path import normalize_path
 
 from pdm.context import context
 from pdm.exceptions import NoPythonVersion
@@ -25,9 +29,6 @@
     get_pep508_environment,
     get_python_version,
 )
-from pythonfinder import Finder
-from vistir.contextmanagers import temp_environ
-from vistir.path import normalize_path
 
 if TYPE_CHECKING:
     from pdm.models.specifiers import PySpecSet
@@ -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

@@ -4,14 +4,13 @@
 
 import appdirs
 import tomlkit
+
 from pdm.exceptions import NoConfigError
 
 
 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 +19,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 +66,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
 

pdm/project/core.py

@@ -5,9 +5,10 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Union
 
+import tomlkit
 from pip._vendor.pkg_resources import safe_name
+from vistir.contextmanagers import atomic_open_for_write
 
-import tomlkit
 from pdm._types import Source
 from pdm.context import context
 from pdm.exceptions import ProjectError
@@ -19,7 +20,6 @@
 from pdm.project.config import Config
 from pdm.project.meta import PackageMeta
 from pdm.utils import find_project_root
-from vistir.contextmanagers import atomic_open_for_write
 
 if TYPE_CHECKING:
     from tomlkit.container import Container

pdm/project/meta.py

@@ -6,9 +6,9 @@
 from typing import TYPE_CHECKING, Dict, List, Union
 
 import setuptools
+import vistir
 from pkg_resources import safe_name
 
-import vistir
 from pdm.exceptions import ProjectError
 from pdm.models.markers import Marker
 

pdm/resolver/reporters.py

@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, Dict, List, Optional
 
 import halo
+
 from pdm.context import context
 
 if TYPE_CHECKING:

pdm/utils.py

@@ -16,9 +16,9 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple
 
+from distlib.wheel import Wheel
 from pip_shims.shims import InstallCommand, PackageFinder, TargetPython
 
-from distlib.wheel import Wheel
 from pdm._types import Source
 
 if TYPE_CHECKING:

pyproject.toml

@@ -54,7 +54,17 @@ not_skip = "__init__.py"
 skip_glob = ["*/setup.py"]
 filter_files = true
 known_first_party = "pdm"
-known_third_party = "pip_shims"
+known_third_party = [
+    "click",
+    "halo",
+    "vistir",
+    "distlib",
+    "pythonfinder",
+    "pytest",
+    "tomlkit",
+    "appdirs",
+    "pip_shims"
+]
 
 [tool.black]
 line-length = 88

tests/cli/test_actions.py

@@ -3,6 +3,7 @@
 import click
 import pytest
 from distlib.wheel import Wheel
+
 from pdm.cli import actions
 from pdm.exceptions import PdmException
 from pdm.models.requirements import parse_requirement

tests/cli/test_cli.py

@@ -5,6 +5,7 @@
 
 import pytest
 from click.testing import CliRunner
+
 from pdm.cli import actions, commands
 from pdm.models.requirements import parse_requirement
 

tests/conftest.py

@@ -7,11 +7,11 @@
 from typing import Callable, Iterable, List, Optional, Tuple
 from urllib.parse import urlparse
 
+import pytest
 from pip._internal.vcs import versioncontrol
 from pip._vendor import requests
 from pip._vendor.pkg_resources import safe_name
 
-import pytest
 from pdm._types import CandidateInfo
 from pdm.cli.actions import do_init
 from pdm.context import context

tests/models/test_candidates.py

@@ -1,4 +1,5 @@
 import pytest
+
 from pdm.exceptions import ExtrasError
 from pdm.models.candidates import Candidate
 from pdm.models.requirements import parse_requirement

tests/models/test_markers.py

@@ -1,4 +1,5 @@
 import pytest
+
 from pdm.models.markers import Marker
 
 

tests/models/test_requirements.py

@@ -1,6 +1,7 @@
 import os
 
 import pytest
+
 from pdm.models.requirements import Requirement, RequirementError, parse_requirement
 from tests import FIXTURES
 

tests/models/test_specifiers.py

@@ -1,4 +1,5 @@
 import pytest
+
 from pdm.models.specifiers import PySpecSet
 
 

tests/resolver/test_resolve.py

@@ -1,6 +1,7 @@
 import itertools
 
 import pytest
+
 from pdm.exceptions import NoVersionsAvailable, ResolutionImpossible
 from pdm.models.candidates import identify
 from pdm.models.requirements import parse_requirement

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