opendev
/
pypi-mirror
Code Issues Proposed changes

Add distribute to the pre-install list 

mysql-python is crapping the fantastic bong because of a continued
reliance on distribute. Fine. We'll just make sure we have latest
no-op package in our virtualenv so that epic fail stops killing bunnies.

Also, when we're running the wheel command in our venvs, we kinda need
wheel to be installed in them.

Change-Id: I004ca4efdbe5997b4f5f56e71a330ed7354d5cd2
This commit is contained in:
Monty Taylor 2013-09-30 01:31:09 -04:00
parent 7dfc0142d7
commit 5dda8efa02
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pypi_mirror/cmd/run_mirror.py
View File

@ -245,13 +245,15 @@ class Mirror(object):
# the setuptools upgrade issues, so upgrading that first
# is a good idea
for requirement in [
"pip", "setuptools", "wheel", "virtualenv"]:
"pip", "setuptools", "distribute",
"wheel", "virtualenv"]:
self.run_command(
upgrade_format % dict(
pip=pip, download_cache=pip_cache_dir,
build_dir=build, find_links=wheelhouse,
requirement=requirement))
for requirement in ["pip", "setuptools", "virtualenv"]:
for requirement in [
"pip", "setuptools", "distribute", "virtualenv"]:
self.run_command(
wheel_format % dict(
pip=pip, download_cache=pip_cache_dir,
@ -293,6 +295,23 @@ class Mirror(object):
reqfd.close()
self.run_command(venv_format % dict(
extra_search_dir=pip_cache_dir, venv_dir=venv))
for requirement in [
"pip", "setuptools", "distribute",
"wheel", "virtualenv"]:
self.run_command(
upgrade_format % dict(
pip=pip, download_cache=pip_cache_dir,
build_dir=build, find_links=wheelhouse,
requirement=requirement))
for requirement in [
"pip", "setuptools", "distribute",
"virtualenv"]:
self.run_command(
wheel_format % dict(
pip=pip, download_cache=pip_cache_dir,
find_links=wheelhouse,
wheel_dir=wheelhouse,
requirement=requirement))
if os.path.exists(build):
shutil.rmtree(build)
self.run_command(