Reopening PR #11 until solution is found

pypa · Jul 9, 2017 · 8618df3 · 8618df3
1 parent 5b7f105
commit 8618df3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py
@@ -59,9 +59,6 @@ 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
             done
 
@@ -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 {package_name} -f /output
 
                 # Install any requirements to run the tests
                 if [ ! -z "{test_requires}" ]; then

diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py
@@ -58,9 +58,6 @@ 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)
@@ -76,8 +73,7 @@ def shell(args, env=None, cwd=None):
             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)
+        shell([pip, 'install', package_name, '-f', output_dir], env=env)
 
         # test the wheel
         if test_requires:

diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py
@@ -66,16 +66,11 @@ 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)
 
         # install the wheel
-        shell(['pip', 'install', package_name, '--upgrade',
-               '--force-reinstall', '--no-deps', '--no-index', '-f',
-               output_dir], env=env)
+        shell(['pip', 'install', package_name, '-f', output_dir], env=env)
 
         # test the wheel
         if test_requires: