diff --git a/pdm/__version__.py b/pdm/__version__.py index 3d27860cae369f153219c3877664532015ddf785..22392d395eddcc995ff2e4a5b875e34c8c2b821e 100644 --- a/pdm/__version__.py +++ b/pdm/__version__.py @@ -1,14 +1,8 @@ from __future__ import annotations -import sys - from packaging.version import Version, parse -if sys.version_info >= (3, 8): - import importlib.metadata as importlib_metadata -else: - import importlib_metadata - +from pdm.compat import importlib_metadata try: __version__ = importlib_metadata.version(__package__) diff --git a/pdm/core.py b/pdm/core.py index dabd3cd19353265f9bd7470e58f2db1178eba9c6..88c20888d2cb816d2cf04ecf48423bb86464ab17 100644 --- a/pdm/core.py +++ b/pdm/core.py @@ -67,7 +67,7 @@ class Core: action="version", version="{}, version {}".format( termui.style("PDM", style="bold"), - self.version, + termui.style(self.version, style="cyan"), ), help="show the version and exit", ) diff --git a/pdm/project/core.py b/pdm/project/core.py index 91302b4a863dd14a7246deb30cfa382f46c800fe..e8add39faf15f2e833ca75a88d460ebba20d9d32 100644 --- a/pdm/project/core.py +++ b/pdm/project/core.py @@ -13,6 +13,7 @@ from urllib.parse import urlparse import platformdirs import tomlkit from findpython import Finder +from tomlkit.items import Array from pdm import termui from pdm._types import Source @@ -562,15 +563,14 @@ class Project: """Get the dependencies array in the pyproject.toml""" if group == "default": return self.meta.setdefault("dependencies", []) - else: - deps_dict = { - False: self.meta.setdefault("optional-dependencies", {}), - True: self.tool_settings.setdefault("dev-dependencies", {}), - } - for deps in deps_dict.values(): - if group in deps: - return deps[group] - return deps_dict[dev].setdefault(group, []) + deps_dict = { + False: self.meta.setdefault("optional-dependencies", {}), + True: self.tool_settings.setdefault("dev-dependencies", {}), + } + for deps in deps_dict.values(): + if group in deps: + return deps[group] + return deps_dict[dev].setdefault(group, []) def add_dependencies( self, @@ -579,9 +579,8 @@ class Project: dev: bool = False, show_message: bool = True, ) -> None: - deps = self.get_pyproject_dependencies(to_group, dev).multiline( # type: ignore - True - ) + deps = cast(Array, self.get_pyproject_dependencies(to_group, dev)) + deps.multiline(True) for _, dep in requirements.items(): matched_index = next( (i for i, r in enumerate(deps) if dep.matches(r)), diff --git a/pdm/termui.py b/pdm/termui.py index 46a2b8fdc612559ba7bbb6404ad1f22e891de7b6..cc57456a4f98c776a012d23081fccfdbe0fd7cc2 100644 --- a/pdm/termui.py +++ b/pdm/termui.py @@ -24,7 +24,6 @@ logger.addHandler(logging.NullHandler()) unearth_logger = logging.getLogger("unearth") unearth_logger.setLevel(logging.DEBUG) - _console = Console(highlight=False) _err_console = Console(stderr=True)