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/filter_wheels.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+"""  Filter out wheel filenames not supported on this platform
+"""
+from __future__ import print_function
+
+def is_supported(fname):
+    from pip.wheel import Wheel
+    return Wheel(fname).supported()
+
+if __name__ == '__main__':
+    import sys
+    from itertools import chain
+    from glob import iglob
+    for whl in filter(is_supported, chain(*map(iglob, sys.argv[1:]))):
+        print(whl)
+    sys.exit(0)

cibuildwheel/linux.py

@@ -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" /cibw/filter_wheels.py /tmp/linux_wheels/*.whl)
 
                 # Install any requirements to run the tests
                 if [ ! -z "{test_requires}" ]; then
@@ -111,6 +107,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
                 '-i',
                 '-v', '%s:/project' % os.path.abspath(project_dir),
                 '-v', '%s:/output' % os.path.abspath(output_dir),
+                '-v', '%s:/cibw' % os.path.dirname(__file__),
                 docker_image,
                 '/bin/bash'],
             stdin=subprocess.PIPE, universal_newlines=True)

cibuildwheel/macos.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-import os, subprocess, shlex, sys
+import os, subprocess, shlex, sys, re
 from collections import namedtuple
 from glob import glob
 try:
@@ -8,6 +8,7 @@
     from pipes import quote as shlex_quote
 
 from .util import prepare_command
+from .filter_wheels import is_supported
 
 
 def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, skip):
@@ -22,7 +23,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 +59,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 +73,14 @@ 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
+        filter_wheels = os.path.join(os.path.dirname(__file__), 'filter_wheels.py')
+        stdout = shell([python, filter_wheels, output_dir + '/*.whl'], env=env)
+        wheels = re.findall(r"^%s/.*\.whl$" % output_dir, stdout, re.MULTILINE)
+
+        # install the wheel
+        shell([pip, 'install'] + wheels, env=env)
 
         # test the wheel
         if test_requires:

cibuildwheel/windows.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-import os, tempfile, subprocess, sys
+import os, tempfile, subprocess, sys, re
 try:
     from urllib2 import urlopen
 except ImportError:
@@ -17,11 +17,11 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
             request = urlopen('https://github.com/ogrisel/python-appveyor-demo/raw/09a1c8672e5015a74d8f69d07add6ee803c176ec/appveyor/run_with_env.cmd')
             f.write(request.read())
 
-    def shell(args, env=None, cwd=None):
+    def shell(args, env=None, cwd=None, **kwargs):
         # 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, **kwargs)
 
     PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'arch', 'identifier', 'path'])
     python_configurations = [
@@ -66,16 +66,17 @@ 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
+        filter_wheels = os.path.join(os.path.dirname(__file__), 'filter_wheels.py')
+        stdout = shell(['python', filter_wheels, output_dir + '\*.whl'], env=env, universal_newlines=True)
+        wheels = re.findall(r"^%s\\.*\.whl$" % output_dir, 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: