Fix several failures. (#163)

A few bugs have crept in with some of my recent changes. Part of the problem is that there hasn't been great test coverage for a bunch of pyperformance code. In this PR I've added a bunch of testing. I've also fixed a number of problems.

Author: ericsnowcurrently

.gitignore

@@ -16,5 +16,8 @@ pyperformance.egg-info/
 venv/
 .venvs/
 
+# Create during tests
+pyperformance/tests/data/cpython/
+
 # Created by the tox program
 .tox/

dev.py

@@ -8,7 +8,20 @@
 VENVS = os.path.join(REPO_ROOT, '.venvs')
 
 
-def ensure_venv_ready(venvroot=None, kind='dev'):
+def resolve_venv_root(kind='dev', venvsdir=VENVS):
+    import sysconfig
+    if sysconfig.is_python_build():
+        sys.exit('please install your built Python first (or pass it using --python)')
+    # XXX Handle other implementations too?
+    base = os.path.join(venvsdir, kind or 'dev')
+    major, minor = sys.version_info[:2]
+    pyloc = ((os.path.abspath(sys.executable)
+              ).partition(os.path.sep)[2].lstrip(os.path.sep)
+             ).replace(os.path.sep, '-')
+    return f'{base}-{major}.{minor}-{pyloc}'
+
+
+def ensure_venv_ready(venvroot=None, kind='dev', venvsdir=VENVS):
     if sys.prefix != sys.base_prefix:
         assert os.path.exists(os.path.join(sys.prefix, 'pyvenv.cfg'))
         venvroot = sys.prefix
@@ -18,16 +31,7 @@ def ensure_venv_ready(venvroot=None, kind='dev'):
     else:
         import venv
         if not venvroot:
-            import sysconfig
-            if sysconfig.is_python_build():
-                sys.exit('please install your built Python first (or pass it using --python)')
-            # XXX Handle other implementations too?
-            base = os.path.join(VENVS, kind or 'dev')
-            major, minor = sys.version_info[:2]
-            pyloc = ((os.path.abspath(sys.executable)
-                      ).partition(os.path.sep)[2].lstrip(os.path.sep)
-                     ).replace(os.path.sep, '-')
-            venvroot = f'{base}-{major}.{minor}-{pyloc}'
+            venvroot = resolve_venv_root(kind, venvsdir)
         # Make sure the venv exists.
         readyfile = os.path.join(venvroot, 'READY')
         isready = os.path.exists(readyfile)
@@ -61,11 +65,11 @@ def ensure_venv_ready(venvroot=None, kind='dev'):
             pass
         print('...venv {relroot} ready!')
 
-    return python
+    return venvroot, python
 
 
 def main(venvroot=None):
-    python = ensure_venv_ready(venvroot)
+    _, python = ensure_venv_ready(venvroot)
     if python != sys.executable:
         # Now re-run using the venv.
         os.execv(python, [python, *sys.argv])

pyperformance/_venv.py

@@ -125,8 +125,13 @@ class VirtualEnvironment:
 
     @classmethod
     def create(cls, root=None, python=sys.executable, **kwargs):
-        if not python or isinstance(python, str):
-            info = _pythoninfo.get_info(python)
+        if not python:
+            python = sys.executable
+        if isinstance(python, str):
+            try:
+                info = _pythoninfo.get_info(python)
+            except FileNotFoundError:
+                info = None
         else:
             info = python
         if not root:
@@ -139,12 +144,14 @@ def create(cls, root=None, python=sys.executable, **kwargs):
         try:
             venv_python = create_venv(
                 root,
-                info,
+                info or python,
                 **kwargs
             )
         except BaseException:
             _utils.safe_rmtree(root)
             raise  # re-raise
+        if not info:
+            info = _pythoninfo.get_info(python)
         self = cls(root, base=info)
         self._python = venv_python
         return self

pyperformance/cli.py

@@ -4,7 +4,20 @@
 import sys
 
 from pyperformance import _utils, is_installed, is_dev
-from pyperformance.venv import cmd_venv
+from pyperformance.commands import (
+    cmd_list,
+    cmd_list_groups,
+    cmd_venv_create,
+    cmd_venv_recreate,
+    cmd_venv_remove,
+    cmd_venv_show,
+    cmd_run,
+    cmd_compile,
+    cmd_compile_all,
+    cmd_upload,
+    cmd_show,
+    cmd_compare,
+)
 
 
 def comma_separated(values):
@@ -243,41 +256,51 @@ def _main():
     parser, options = parse_args()
 
     if options.action == 'venv':
-        if options.venv_action in ('create', 'recreate'):
+        from . import _pythoninfo, _venv
+
+        if not options.venv:
+            info = _pythoninfo.get_info(options.python)
+            root = _venv.get_venv_root(python=info)
+        else:
+            root = options.venv
+            info = None
+
+        action = options.venv_action
+        if action == 'create':
             benchmarks = _benchmarks_from_options(options)
+            cmd_venv_create(options, root, info, benchmarks)
+        elif action == 'recreate':
+            benchmarks = _benchmarks_from_options(options)
+            cmd_venv_recreate(options, root, info, benchmarks)
+        elif action == 'remove':
+            cmd_venv_remove(options, root)
+        elif action == 'show':
+            cmd_venv_show(options, root)
         else:
-            benchmarks = None
-        cmd_venv(options, benchmarks)
-        sys.exit()
+            print(f'ERROR: unsupported venv command action {action!r}')
+            parser.print_help()
+            sys.exit(1)
     elif options.action == 'compile':
-        from pyperformance.compile import cmd_compile
         cmd_compile(options)
         sys.exit()
     elif options.action == 'compile_all':
-        from pyperformance.compile import cmd_compile_all
         cmd_compile_all(options)
         sys.exit()
     elif options.action == 'upload':
-        from pyperformance.compile import cmd_upload
         cmd_upload(options)
         sys.exit()
     elif options.action == 'show':
-        from pyperformance.compare import cmd_show
         cmd_show(options)
         sys.exit()
     elif options.action == 'run':
-        from pyperformance.cli_run import cmd_run
         benchmarks = _benchmarks_from_options(options)
         cmd_run(options, benchmarks)
     elif options.action == 'compare':
-        from pyperformance.compare import cmd_compare
         cmd_compare(options)
     elif options.action == 'list':
-        from pyperformance.cli_run import cmd_list
         benchmarks = _benchmarks_from_options(options)
         cmd_list(options, benchmarks)
     elif options.action == 'list_groups':
-        from pyperformance.cli_run import cmd_list_groups
         manifest = _manifest_from_options(options)
         cmd_list_groups(manifest)
     else: