From 2bc6e5c41a6616b842c17ef0730d0d7c1f3787e9 Mon Sep 17 00:00:00 2001
From: Frost Ming <mianghong@gmail.com>
Date: Tue, 4 Feb 2020 19:10:28 +0800
Subject: [PATCH] Fix PEP 517 build errors Display dist in two columns for pdm
 list

---
 pdm/__init__.py       | 2 +-
 pdm/builders/api.py   | 4 ++--
 pdm/builders/wheel.py | 1 +
 pdm/cli/actions.py    | 9 +++++++--
 pdm/installers.py     | 8 ++------
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pdm/__init__.py b/pdm/__init__.py
index b1a19e32..034f46c3 100644
--- a/pdm/__init__.py
+++ b/pdm/__init__.py
@@ -1 +1 @@
-__version__ = "0.0.5"
+__version__ = "0.0.6"
diff --git a/pdm/builders/api.py b/pdm/builders/api.py
index 440c7f55..b1272a3a 100644
--- a/pdm/builders/api.py
+++ b/pdm/builders/api.py
@@ -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
diff --git a/pdm/builders/wheel.py b/pdm/builders/wheel.py
index cfbf0c07..bc11f725 100644
--- a/pdm/builders/wheel.py
+++ b/pdm/builders/wheel.py
@@ -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:
diff --git a/pdm/cli/actions.py b/pdm/cli/actions.py
index 8a71daf9..ddfea8e9 100644
--- a/pdm/cli/actions.py
+++ b/pdm/cli/actions.py
@@ -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(
diff --git a/pdm/installers.py b/pdm/installers.py
index 7105ff68..d1c82bea 100644
--- a/pdm/installers.py
+++ b/pdm/installers.py
@@ -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):
-- 
GitLab