未验证 提交 2bc6e5c4 编写于 作者: F Frost Ming

Fix PEP 517 build errors

Display dist in two columns for pdm list
上级 92dad69a
__version__ = "0.0.5" __version__ = "0.0.6"
...@@ -49,7 +49,7 @@ def build_wheel(wheel_directory, config_settings=None, metadata_directory=None): ...@@ -49,7 +49,7 @@ def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
ireq = parse_requirement(".").as_ireq() ireq = parse_requirement(".").as_ireq()
ireq.source_dir = "." ireq.source_dir = "."
with WheelBuilder(ireq) as builder: with WheelBuilder(ireq) as builder:
return builder.build(wheel_directory) return Path(builder.build(wheel_directory)).name
def build_sdist(sdist_directory, config_settings=None): def build_sdist(sdist_directory, config_settings=None):
...@@ -57,4 +57,4 @@ def build_sdist(sdist_directory, config_settings=None): ...@@ -57,4 +57,4 @@ def build_sdist(sdist_directory, config_settings=None):
ireq = parse_requirement(".").as_ireq() ireq = parse_requirement(".").as_ireq()
ireq.source_dir = "." ireq.source_dir = "."
with SdistBuilder(ireq) as builder: with SdistBuilder(ireq) as builder:
return builder.build(sdist_directory) return Path(builder.build(sdist_directory)).name
...@@ -82,6 +82,7 @@ class WheelBuilder(Builder): ...@@ -82,6 +82,7 @@ class WheelBuilder(Builder):
shutil.move(temp_path, target) shutil.move(temp_path, target)
context.io.echo("- Built {}".format(context.io.cyan(os.path.basename(target)))) context.io.echo("- Built {}".format(context.io.cyan(os.path.basename(target))))
return target
@property @property
def wheel_filename(self) -> str: def wheel_filename(self) -> str:
......
...@@ -2,6 +2,7 @@ import itertools ...@@ -2,6 +2,7 @@ import itertools
import shutil import shutil
from typing import Dict, Iterable, Optional, Sequence from typing import Dict, Iterable, Optional, Sequence
import click
import halo import halo
import tomlkit import tomlkit
from pkg_resources import safe_name from pkg_resources import safe_name
...@@ -288,8 +289,12 @@ def do_remove( ...@@ -288,8 +289,12 @@ def do_remove(
def do_list(project: Project) -> None: def do_list(project: Project) -> None:
working_set = project.environment.get_working_set() working_set = project.environment.get_working_set()
for key, dist in working_set.items(): formatter = click.HelpFormatter()
context.io.echo(format_dist(dist)) rows = [
(context.io.green(k, bold=True), format_dist(v)) for k, v in working_set.items()
]
formatter.write_dl(rows)
context.io.echo(formatter.getvalue().rstrip("\n"))
def do_build( def do_build(
......
...@@ -28,15 +28,11 @@ def _is_dist_editable(dist: Distribution) -> bool: ...@@ -28,15 +28,11 @@ def _is_dist_editable(dist: Distribution) -> bool:
def format_dist(dist: Distribution) -> str: def format_dist(dist: Distribution) -> str:
formatter = "{name} {version}{path}" formatter = "{version}{path}"
path = "" path = ""
if _is_dist_editable(dist): if _is_dist_editable(dist):
path = f" (-e {dist.location})" path = f" (-e {dist.location})"
return formatter.format( return formatter.format(version=context.io.yellow(dist.version), path=path)
name=context.io.green(dist.project_name, bold=True),
version=context.io.yellow(dist.version),
path=path,
)
def _print_list_information(word, items, dry=False): def _print_list_information(word, items, dry=False):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册