Merge branch 'master' of github.com:joerick/cibuildwheel into deterministic-builds

# Conflicts:
#	cibuildwheel/__main__.py
#	cibuildwheel/linux.py
#	cibuildwheel/macos.py
#	cibuildwheel/windows.py

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.2.0'

cibuildwheel/__main__.py

@@ -115,6 +115,7 @@ def main():
         repair_command_default = ''
     repair_command = get_option_from_environment('CIBW_REPAIR_WHEEL_COMMAND', platform=platform, default=repair_command_default)
     environment_config = get_option_from_environment('CIBW_ENVIRONMENT', platform=platform, default='')
+    before_test = get_option_from_environment('CIBW_BEFORE_TEST', platform=platform, default='')
 
     dependency_versions = get_option_from_environment('CIBW_DEPENDENCY_VERSIONS', platform=platform, default='pinned')
     if dependency_versions == 'pinned':
@@ -164,6 +165,7 @@ def main():
         build_selector=build_selector,
         repair_command=repair_command,
         environment=environment,
+        before_test=before_test,
         dependency_constraints=dependency_constraints,
     )
 

cibuildwheel/linux.py

@@ -68,7 +68,7 @@ def get_python_configurations(build_selector):
     return [c for c in python_configurations if matches_platform(c.identifier) and build_selector(c.identifier)]
 
 
-def build(project_dir, output_dir, test_command, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, manylinux_images, dependency_constraints):
+def build(project_dir, output_dir, test_command, before_test, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, manylinux_images, dependency_constraints):
     try:
         subprocess.check_call(['docker', '--version'])
     except Exception:
@@ -175,6 +175,10 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
 
                                 echo "Running tests using `which python`"
 
+                                if [ ! -z {before_build} ]; then
+                                    sh -c {before_build}
+                                fi
+
                                 # Install the wheel we just built
                                 # Note: If auditwheel produced two wheels, it's because the earlier produced wheel
                                 # conforms to multiple manylinux standards. These multiple versions of the wheel are
@@ -224,6 +228,9 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
                         environment_exports='\n'.join(environment.as_shell_commands()),
                         uid=os.getuid(),
                         gid=os.getgid(),
+                        before_test=shlex.quote(
+                            prepare_command(before_test, project='/project') if before_test else ''
+                        ),
                         dependency_install_flags='-c /constraints.txt' if dependency_constraints else '',
                     )
                 )

cibuildwheel/macos.py

@@ -106,7 +106,7 @@ def install_pypy(version, url):
     return installation_bin_path
 
 
-def build(project_dir, output_dir, test_command, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, dependency_constraints):
+def build(project_dir, output_dir, test_command, before_test, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, dependency_constraints):
     abs_project_dir = os.path.abspath(project_dir)
     temp_dir = tempfile.mkdtemp(prefix='cibuildwheel')
     built_wheel_dir = os.path.join(temp_dir, 'built_wheel')
@@ -219,6 +219,10 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
             # check that we are using the Python from the virtual environment
             call(['which', 'python'], env=virtualenv_env)
 
+            if before_test:
+                before_test_prepared = prepare_command(before_test, project=abs_project_dir)
+                call(before_test_prepared, env=virtualenv_env, shell=True)
+
             # install the wheel
             call(['pip', 'install', repaired_wheel + test_extras], env=virtualenv_env)
 

cibuildwheel/windows.py

@@ -21,8 +21,7 @@ IS_RUNNING_ON_TRAVIS = os.environ.get('TRAVIS_OS_NAME') == 'windows'
 
 def shell(args, env=None, cwd=None):
     print('+ ' + ' '.join(args))
-    args = ['cmd', '/E:ON', '/V:ON', '/C'] + args
-    return subprocess.check_call(' '.join(args), env=env, cwd=cwd)
+    return subprocess.check_call(' '.join(args), env=env, cwd=cwd, shell=True)
 
 
 def get_nuget_args(version, arch):
@@ -88,7 +87,7 @@ def install_pypy(version, arch, url):
     return installation_path
 
 
-def build(project_dir, output_dir, test_command, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, dependency_constraints):
+def build(project_dir, output_dir, test_command, before_test, test_requires, test_extras, before_build, build_verbosity, build_selector, repair_command, environment, dependency_constraints):
     abs_project_dir = os.path.abspath(project_dir)
     temp_dir = tempfile.mkdtemp(prefix='cibuildwheel')
     built_wheel_dir = os.path.join(temp_dir, 'built_wheel')
@@ -201,6 +200,10 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
             # check that we are using the Python from the virtual environment
             shell(['which', 'python'], env=virtualenv_env)
 
+            if before_test:
+                before_test_prepared = prepare_command(before_test, project=abs_project_dir)
+                shell([before_test_prepared], env=virtualenv_env)
+
             # install the wheel
             shell(['pip', 'install', repaired_wheel + test_extras], env=virtualenv_env)