opendev/pypi-mirror
Code Issues Proposed changes

Upgrade pip and setuptools in the mirror venv

Browse Source 
Older pip does not process transitive dependencies properly. To ensure
that 3rd level transitive depends get processed by run-mirror, ensure
that we have current pip in our mirror build environment.

Without upgrading setuptools, we can hit the transitive depend problem.

Change-Id: I4a4611109ed9b35dea2efc00583ab69ebc1a39ba
This commit is contained in:
Monty Taylor 2013-07-19 18:05:32 -07:00
parent 2cafdd2fe4
commit c20173e18d
1 changed files with 8 additions and 0 deletions
Show Stats 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 "
"--download-cache=%s --build %s -r %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()
reqs = os.path.join(workdir, "reqs")
@ -214,6 +216,12 @@ class Mirror(object):
if reqlist:
out = self.run_command(venv_format %
(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):
shutil.rmtree(build)
new_reqs = self.process_http_requirements(reqlist,