opendev/pypi-mirror
Code Issues Proposed changes

Merge "Upgrade pip and setuptools in the mirror venv"

Browse Source
This commit is contained in:
Jenkins
2013-07-20 16:50:06 +00:00
committed by Gerrit Code Review
parent eeb4fdad97 c20173e18d
commit 35ed3f4689
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jeepyb/cmd/run_mirror.py
View File

@@ -160,6 +160,8 @@ class Mirror(object):
pip_format = ("%s install -M -U %s --exists-action=w " pip_format = ("%s install -M -U %s --exists-action=w "
"--download-cache=%s --build %s -r %s") "--download-cache=%s --build %s -r %s")
venv_format = ("virtualenv --clear --extra-search-dir=%s %s") venv_format = ("virtualenv --clear --extra-search-dir=%s %s")
upgrade_format = ("%s install -U --exists-action=w "
"--download-cache=%s --build %s %s")
workdir = tempfile.mkdtemp() workdir = tempfile.mkdtemp()
reqs = os.path.join(workdir, "reqs") reqs = os.path.join(workdir, "reqs")
@@ -214,6 +216,12 @@ class Mirror(object):
if reqlist: if reqlist:
out = self.run_command(venv_format % out = self.run_command(venv_format %
(pip_cache_dir, venv)) (pip_cache_dir, venv))
out = self.run_command(upgrade_format %
(pip, pip_cache_dir,
build, "setuptools"))
out = self.run_command(upgrade_format %
(pip, pip_cache_dir,
build, "pip"))
if os.path.exists(build): if os.path.exists(build):
shutil.rmtree(build) shutil.rmtree(build)
new_reqs = self.process_http_requirements(reqlist, new_reqs = self.process_http_requirements(reqlist,