opendev/pypi-mirror
Code Issues Proposed changes

Don't upgrade setuptools or distribute

Browse Source 
It turns out that upgrading setuptools and distribute in the venv
we use to build the mirror causes MySQL-python to error out. However,
as of virtualenv 1.10.1, there's a new enough version of pip (1.4)
so it's actually not necessary for us to explicitly upgrade.

Change-Id: Ib08064ad1ce674323cd5dec87b7a9911c723d12a
This commit is contained in:
Monty Taylor 2013-11-14 11:11:16 -05:00
parent 5dda8efa02
commit d68260a79a
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pypi_mirror/cmd/run_mirror.py
View File

@ -235,18 +235,8 @@ class Mirror(object):
self.run_command( self.run_command(
venv_format % dict( venv_format % dict(
extra_search_dir=pip_cache_dir, venv_dir=venv)) extra_search_dir=pip_cache_dir, venv_dir=venv))
# Need to do these separately. If you attempt to upgrade
# setuptools with something else, you can get into a
# situation where distribute has been upgraded, but pip
# attemps to install something else before installing
# the setuptools replacement. The safest thing is to
# simply upgrade setuptools by itself.
# There is a current theory that pip 1.4 may solve
# the setuptools upgrade issues, so upgrading that first
# is a good idea
for requirement in [ for requirement in [
"pip", "setuptools", "distribute", "pip", "wheel", "virtualenv"]:
"wheel", "virtualenv"]:
self.run_command( self.run_command(
upgrade_format % dict( upgrade_format % dict(
pip=pip, download_cache=pip_cache_dir, pip=pip, download_cache=pip_cache_dir,
@ -296,22 +286,12 @@ class Mirror(object):
self.run_command(venv_format % dict( self.run_command(venv_format % dict(
extra_search_dir=pip_cache_dir, venv_dir=venv)) extra_search_dir=pip_cache_dir, venv_dir=venv))
for requirement in [ for requirement in [
"pip", "setuptools", "distribute", "pip", "wheel"]:
"wheel", "virtualenv"]:
self.run_command( self.run_command(
upgrade_format % dict( upgrade_format % dict(
pip=pip, download_cache=pip_cache_dir, pip=pip, download_cache=pip_cache_dir,
build_dir=build, find_links=wheelhouse, build_dir=build, find_links=wheelhouse,
requirement=requirement)) 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): if os.path.exists(build):
shutil.rmtree(build) shutil.rmtree(build)
self.run_command( self.run_command(

2
requirements.txt
View File

@ -1,3 +1,3 @@
PyYAML>=3.1.0 PyYAML>=3.1.0
pkginfo pkginfo
pip>=1.4 virtualenv>=1.10.1