remove venv if any exception occurs (#194)

Author: Chad Smith

README.md

@@ -22,7 +22,7 @@ pipx: execute binaries from Python packages in isolated environments
 <a href="https://travis-ci.org/pipxproject/pipx"><img src="https://travis-ci.org/pipxproject/pipx.svg?branch=master" /></a>
 
 <a href="https://pypi.python.org/pypi/pipx/">
-<img src="https://img.shields.io/badge/pypi-0.13.2.0-blue.svg" /></a>
+<img src="https://img.shields.io/badge/pypi-0.13.2.1-blue.svg" /></a>
 <a href="https://github.com/ambv/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
 </p>
 

automation.py

@@ -6,7 +6,8 @@
 
 @nox.session(python=["3.6", "3.7"])
 def develop(session):
-    session.install("-e", ".", ".[dev]", ".[docs]")
+    session.install(".[dev]", ".[docs]")
+    session.install("-e", ".")
 
 
 @nox.session(python=python)

docs/changelog.md

@@ -1,3 +1,6 @@
+0.13.2.1
+- Remove virtual environment if installation did not complete (#193)
+
 0.13.2.0
 - Add shell autocompletions. Also add `pipx completions` command to print instructions on how to add pipx completions to your shell.
 - Un-deprecate `ensurepath`. Use `userpath` internally instead of instructing users to run the `userpath` cli command.

docs/index.md

@@ -19,7 +19,7 @@ See Contributing for how to update this file.
 <a href="https://travis-ci.org/pipxproject/pipx"><img src="https://travis-ci.org/pipxproject/pipx.svg?branch=master" /></a>
 
 <a href="https://pypi.python.org/pypi/pipx/">
-<img src="https://img.shields.io/badge/pypi-0.13.2.0-blue.svg" /></a>
+<img src="https://img.shields.io/badge/pypi-0.13.2.1-blue.svg" /></a>
 <a href="https://github.com/ambv/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
 </p>
 

pipx/colors.py

@@ -29,5 +29,6 @@ def stylize_text(x):
 
 bold = mkcolorfunc(c.bold)
 red = mkcolorfunc(c.red)
-cyan = mkcolorfunc(c.cyan)
+blue = mkcolorfunc(c.cyan)
+cyan = mkcolorfunc(c.blue)
 green = mkcolorfunc(c.green)

pipx/commands.py

@@ -307,23 +307,24 @@ def install(
             print(
                 f"{package!r} already seems to be installed. "
                 f"Not modifying existing installation in {str(venv_dir)!r}. "
-                "Pass '--force' to force installation"
+                "Pass '--force' to force installation."
             )
             return
 
     venv = Venv(venv_dir, python=python, verbose=verbose)
-    venv.create_venv(venv_args, pip_args)
     try:
+        venv.create_venv(venv_args, pip_args)
         venv.install_package(package_or_url, pip_args)
-    except PipxError:
-        venv.remove_venv()
-        raise
 
-    if venv.get_venv_metadata_for_package(package).package_version is None:
-        venv.remove_venv()
-        raise PipxError(f"Could not find package {package}. Is the name correct?")
+        if venv.get_venv_metadata_for_package(package).package_version is None:
+            venv.remove_venv()
+            raise PipxError(f"Could not find package {package}. Is the name correct?")
 
-    _run_post_install_actions(venv, package, local_bin_dir, venv_dir, include_deps)
+        _run_post_install_actions(venv, package, local_bin_dir, venv_dir, include_deps)
+    except (Exception, KeyboardInterrupt):
+        print("")
+        venv.remove_venv()
+        raise
 
 
 def _run_post_install_actions(

pipx/main.py

@@ -30,8 +30,9 @@
     mkdir,
     autocomplete_list_of_installed_packages as _autocomplete_list_of_installed_packages,
 )
+from .colors import bold, green
 
-__version__ = "0.13.2.0"
+__version__ = "0.13.2.1"
 
 
 def print_version() -> None:
@@ -484,9 +485,10 @@ def setup(args):
         exit(0)
 
     if "verbose" in args and args.verbose:
-        logging.basicConfig(
-            level=logging.DEBUG, format="pipx (%(funcName)s:%(lineno)d): %(message)s"
-        )
+        pipx_str = bold(green("pipx >")) if sys.stdout.isatty() else "pipx >"
+        format_str = f"{pipx_str} (%(funcName)s:%(lineno)d): %(message)s"
+
+        logging.basicConfig(level=logging.DEBUG, format=format_str)
     else:
         logging.basicConfig(level=logging.WARNING, format="%(message)s")