Don't use wheel when constructing the base mirror

Clients of the mirror may need to fall back on non-wheel files,
and if an upstream project has published wheels, then the mirror
will be missing those in the non-wheel portion. Additionally,
use-wheel given to the wheel command will cause transitive depends
to be skipped in the local wheelhouse.

The only thing that should be making/injecting wheels is the wheel
creation portion of things.

Change-Id: I5e3c4754097249e52f013f6122ff86f01568243c
This commit is contained in:
Monty Taylor 2013-11-16 03:49:25 -05:00
parent d68260a79a
commit 7183290008
1 changed files with 3 additions and 3 deletions

View File

@ -159,7 +159,7 @@ class Mirror(object):
def build_mirror(self, mirror):
print("Building mirror: %s" % mirror['name'])
pip_format = (
"%(pip)s install -U %(extra_args)s --exists-action=w --use-wheel"
"%(pip)s install -U %(extra_args)s --exists-action=w"
" --download-cache=%(download_cache)s"
" --build %(build_dir)s -f %(find_links)s"
" -r %(requirements_file)s")
@ -167,12 +167,12 @@ class Mirror(object):
"virtualenv --clear --extra-search-dir=%(extra_search_dir)s"
" %(venv_dir)s")
upgrade_format = (
"%(pip)s install -U --use-wheel --exists-action=w"
"%(pip)s install -U --exists-action=w"
" --download-cache=%(download_cache)s --build %(build_dir)s"
" -f %(find_links)s %(requirement)s")
wheel_file_format = (
"%(pip)s wheel --download-cache=%(download_cache)s"
" --use-wheel --wheel-dir %(wheel_dir)s -f %(find_links)s"
" --wheel-dir %(wheel_dir)s -f %(find_links)s"
" -r %(requirements_file)s")
wheel_format = (
"%(pip)s wheel --download-cache=%(download_cache)s"