Replacing {python} and {pip} in CIBW_TEST_COMMAND (and {project} in CIBW_BEFORE_BUILD) for consistency

cibuildwheel/linux.py

@@ -103,10 +103,10 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
             pybin_paths=' '.join(c.path+'/bin' for c in platform_configs),
             test_requires=' '.join(test_requires),
             test_command=shlex_quote(
-                test_command.format(project='/project') if test_command else ''
+                test_command.format(python='python', pip='pip', project='/project') if test_command else ''
             ),
             before_build=shlex_quote(
-                prepare_command(before_build, python='python', pip='pip') if before_build else ''
+                prepare_command(before_build, python='python', pip='pip', project='/project') if before_build else ''
             ),
             environment_exports='\n'.join(environment.as_shell_commands()),
         )

cibuildwheel/macos.py

@@ -83,7 +83,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
 
         # run the before_build command
         if before_build:
-            before_build_prepared = prepare_command(before_build, python=python, pip=pip)
+            before_build_prepared = prepare_command(before_build, python=python, pip=pip, project=abs_project_dir)
             call(before_build_prepared, env=env, shell=True)
 
         # build the wheel
@@ -110,8 +110,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
             # run the tests from $HOME, with an absolute path in the command
             # (this ensures that Python runs the tests against the installed wheel
             # and not the repo code)
-            test_command_absolute = test_command.format(project=abs_project_dir)
-            call(shlex.split(test_command_absolute), cwd=os.environ['HOME'], env=env)
+            test_command_prepared = prepare_command(test_command, python=python, pip=pip, project=abs_project_dir)
+            call(shlex.split(test_command_prepared), cwd=os.environ['HOME'], env=env)
 
         # we're all done here; move it to output
         shutil.move(delocated_wheel, output_dir)

cibuildwheel/util.py

@@ -1,7 +1,7 @@
 from fnmatch import fnmatch
 
 
-def prepare_command(command, python, pip):
+def prepare_command(command, python, pip, project):
     '''
     Preprocesses a command by expanding variables like {python} or {pip}.
 
@@ -10,7 +10,7 @@ def prepare_command(command, python, pip):
     Python 3, the user could write `{python} setup.py test`. This command would expand
     it out to python2 or python3 as appropriate.
     '''
-    return command.format(python=python, pip=pip)
+    return command.format(python=python, pip=pip, project=project)
 
 
 class BuildSkipper(object):

cibuildwheel/windows.py

@@ -78,7 +78,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
 
         # run the before_build command
         if before_build:
-            before_build_prepared = prepare_command(before_build, python='python', pip='pip')
+            before_build_prepared = prepare_command(before_build, python='python', pip='pip', project=abs_project_dir)
             shell([before_build_prepared], env=env)
 
         # build the wheel
@@ -95,8 +95,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
             # run the tests from c:\, with an absolute path in the command
             # (this ensures that Python runs the tests against the installed wheel
             # and not the repo code)
-            test_command_absolute = test_command.format(project=abs_project_dir)
-            shell([test_command_absolute], cwd='c:\\', env=env)
+            test_command_prepared = prepare_command(test_command, python='python', pip='pip', project=abs_project_dir)
+            shell([test_command_prepared], cwd='c:\\', env=env)
 
         # we're all done here; move it to output
         shutil.move(built_wheel, output_dir)