未验证 提交 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):
ireq = parse_requirement(".").as_ireq()
ireq.source_dir = "."
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):
......@@ -57,4 +57,4 @@ def build_sdist(sdist_directory, config_settings=None):
ireq = parse_requirement(".").as_ireq()
ireq.source_dir = "."
with SdistBuilder(ireq) as builder:
return builder.build(sdist_directory)
return Path(builder.build(sdist_directory)).name
......@@ -82,6 +82,7 @@ class WheelBuilder(Builder):
shutil.move(temp_path, target)
context.io.echo("- Built {}".format(context.io.cyan(os.path.basename(target))))
return target
@property
def wheel_filename(self) -> str:
......
......@@ -2,6 +2,7 @@ import itertools
import shutil
from typing import Dict, Iterable, Optional, Sequence
import click
import halo
import tomlkit
from pkg_resources import safe_name
......@@ -288,8 +289,12 @@ def do_remove(
def do_list(project: Project) -> None:
working_set = project.environment.get_working_set()
for key, dist in working_set.items():
context.io.echo(format_dist(dist))
formatter = click.HelpFormatter()
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(
......
......@@ -28,15 +28,11 @@ def _is_dist_editable(dist: Distribution) -> bool:
def format_dist(dist: Distribution) -> str:
formatter = "{name} {version}{path}"
formatter = "{version}{path}"
path = ""
if _is_dist_editable(dist):
path = f" (-e {dist.location})"
return formatter.format(
name=context.io.green(dist.project_name, bold=True),
version=context.io.yellow(dist.version),
path=path,
)
return formatter.format(version=context.io.yellow(dist.version), path=path)
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.
先完成此消息的编辑!
想要评论请 注册