revert PR9; add --no-deps to pip wheel

Revert PR9; it was never actually needed in the first place it just fixed an
issue by side effect.

1) add --no-deps to pip wheel step in order to avoid building wheels for
   dependencies. This also addresses the issues raised in PR pypa#11.

2) Modify the pip install step across platforms to allow installation of
   dependencies from the index. (This is required since we will no longer be
   building wheels for dependencies).

Author: tgarc

cibuildwheel/linux.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 import os, subprocess, sys
 from collections import namedtuple
-from .util import prepare_command
+from .util import prepare_command, filter_wheels_cmd
 
 try:
     from shlex import quote as shlex_quote
@@ -59,10 +59,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
                     PATH=$PYBIN:$PATH sh -c {before_build}
                 fi
 
-                # install the package first to take care of dependencies
-                "$PYBIN/pip" install .
-
-                "$PYBIN/pip" wheel --no-deps . -w /tmp/linux_wheels
+                "$PYBIN/pip" wheel . -w /tmp/linux_wheels --no-deps
             done
 
             for whl in /tmp/linux_wheels/*.whl; do
@@ -77,8 +74,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
             # Install packages and test
             for PYBIN in {pybin_paths}; do
                 # Install the wheel we just built
-                "$PYBIN/pip" install {package_name} \
-                    --upgrade --force-reinstall --no-deps --no-index -f /output
+                "$PYBIN/pip" install $("$PYBIN/python" -c "{filter_wheels}" /tmp/linux_wheels/*.whl)
 
                 # Install any requirements to run the tests
                 if [ ! -z "{test_requires}" ]; then
@@ -93,6 +89,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
                 fi
             done
         '''.format(
+            filter_wheels=filter_wheels_cmd,
             package_name=package_name,
             pybin_paths=' '.join(c.path+'/bin' for c in platform_configs),
             test_requires=' '.join(test_requires),

cibuildwheel/macos.py

@@ -7,7 +7,7 @@
 except ImportError:
     from pipes import quote as shlex_quote
 
-from .util import prepare_command
+from .util import prepare_command, filter_wheels_cmd
 
 
 def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, skip):
@@ -22,7 +22,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
     def shell(args, env=None, cwd=None):
         # print the command executing for the logs
         print('+ ' + ' '.join(shlex_quote(a) for a in args))
-        return subprocess.check_call(args, env=env, cwd=cwd)
+        return subprocess.check_output(args, env=env, cwd=cwd)
 
     for config in python_configurations:
         if skip(config.identifier):
@@ -58,14 +58,11 @@ def shell(args, env=None, cwd=None):
             before_build_prepared = prepare_command(before_build, python=python, pip=pip)
             shell(shlex.split(before_build_prepared), env=env)
 
-        # install the package first to take care of dependencies
-        shell([pip, 'install', project_dir], env=env)
-
         # build the wheel to temp dir
         temp_wheel_dir = '/tmp/tmpwheel%s' % config.version
         shell([pip, 'wheel', project_dir, '-w', temp_wheel_dir, '--no-deps'], env=env)
-        temp_wheel = glob(temp_wheel_dir+'/*.whl')[0]
 
+        temp_wheel = glob(temp_wheel_dir+'/*.whl')[0]
         if temp_wheel.endswith('none-any.whl'):
             # pure python wheel - just copy to output_dir
             shell(['cp', temp_wheel, output_dir], env=env)
@@ -75,9 +72,12 @@ def shell(args, env=None, cwd=None):
             # rebuild the wheel with shared libraries included and place in output dir
             shell(['delocate-wheel', '-w', output_dir, temp_wheel], env=env)
 
-        # now install the package from the generated wheel
-        shell([pip, 'install', package_name, '--upgrade', '--force-reinstall',
-               '--no-deps', '--no-index', '--find-links', output_dir], env=env)
+        # Grab the built wheel for this platform
+        # Note: filter wheels *must* be run from inside the build environment
+        wheels = shell([python, '-c', filter_wheels_cmd, output_dir + '/*.whl'], env=env).split()
+
+        # install the wheel
+        shell([pip, 'install'] + wheels, env=env)
 
         # test the wheel
         if test_requires:

cibuildwheel/util.py

@@ -1,5 +1,11 @@
 from fnmatch import fnmatch
 
+filter_wheels_cmd = '''\
+import sys, glob, itertools, pip; \
+sys.stdout.write(\
+' '.join(f for f in itertools.chain(*map(glob.iglob, sys.argv[1:])) \
+if pip.wheel.Wheel(f).supported()))\
+'''
 
 def prepare_command(command, python, pip):
     '''

cibuildwheel/windows.py

@@ -1,12 +1,12 @@
 from __future__ import print_function
-import os, tempfile, subprocess, sys
+import os, tempfile, subprocess, sys, re
 try:
     from urllib2 import urlopen
 except ImportError:
     from urllib.request import urlopen
 from collections import namedtuple
 
-from .util import prepare_command
+from .util import prepare_command, filter_wheels_cmd
 
 
 def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, skip):
@@ -21,7 +21,7 @@ def shell(args, env=None, cwd=None):
         # print the command executing for the logs
         print('+ ' + ' '.join(args))
         args = ['cmd', '/E:ON', '/V:ON', '/C', run_with_env] + args
-        return subprocess.check_call(' '.join(args), env=env, cwd=cwd)
+        return subprocess.check_output(' '.join(args), env=env, cwd=cwd)
 
     PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'arch', 'identifier', 'path'])
     python_configurations = [
@@ -66,16 +66,16 @@ def shell(args, env=None, cwd=None):
             before_build_prepared = prepare_command(before_build, python='python', pip='pip')
             shell([before_build_prepared], env=env)
 
-        # install the package first to take care of dependencies
-        shell(['pip', 'install', project_dir], env=env)
-
         # build the wheel
         shell(['pip', 'wheel', project_dir, '-w', output_dir, '--no-deps'], env=env)
 
+        # Grab the built wheel for this platform
+        # Note: filter wheels *must* be run from inside the build environment
+        stdout = shell(['python', '-c', '"'+filter_wheels_cmd+'"', output_dir + '\*.whl'], env=env)
+        wheels = re.findall(output_dir + r'\\[^\s*]+\.whl', stdout, re.MULTILINE)
+
         # install the wheel
-        shell(['pip', 'install', package_name, '--upgrade',
-               '--force-reinstall', '--no-deps', '--no-index', '-f',
-               output_dir], env=env)
+        shell(['pip', 'install'] + wheels, env=env)
 
         # test the wheel
         if test_requires: