opendev/pypi-mirror
Code Issues Proposed changes

Revert "Be more agressive trying to install requirements."

Browse Source 
This reverts commit f4ed0c3120852c2a59af8ebc4fdf657672787d67
This commit is contained in:
Monty Taylor 2013-07-20 15:06:30 +00:00 committed by Gerrit Code Review
parent f4ed0c3120
commit 2cafdd2fe4
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
jeepyb/cmd/run_mirror.py
View File

@ -158,7 +158,7 @@ class Mirror(object):
def build_mirror(self, mirror):
print("Building mirror: %s" % mirror['name'])
pip_format = ("%s install -M -U %s --exists-action=w "
"--download-cache=%s --build %s %s")
"--download-cache=%s --build %s -r %s")
venv_format = ("virtualenv --clear --extra-search-dir=%s %s")
workdir = tempfile.mkdtemp()
@ -219,39 +219,41 @@ class Mirror(object):
new_reqs = self.process_http_requirements(reqlist,
pip_cache_dir,
pip)
for req in new_reqs:
out = self.run_command(pip_format %
(pip, "", pip_cache_dir,
build, req))
if "\nSuccessfully installed " not in out:
sys.stderr.write(
"Installing pip requires for %s:%s "
"failed.\n%s\n" % (project, branch, out))
print("pip install did not indicate success")
freeze = self.run_command("%s freeze -l" % pip)
requires = self.find_pkg_info(build)
reqfd = open(reqs, "w")
for line in freeze.split("\n"):
if line.startswith("-e ") or (
"==" in line and " " not in line):
requires.add(line)
for r in requires:
reqfd.write(r + "\n")
reqfd.close()
out = self.run_command(venv_format %
(pip_cache_dir, venv))
if os.path.exists(build):
shutil.rmtree(build)
(reqfp, reqfn) = tempfile.mkstemp()
os.write(reqfp, '\n'.join(new_reqs))
os.close(reqfp)
out = self.run_command(pip_format %
(pip, "--no-install",
pip_cache_dir, build, reqs))
if "\nSuccessfully downloaded " not in out:
sys.stderr.write("Downloading pip requires for "
"%s:%s failed.\n%s\n" %
(pip, "", pip_cache_dir,
build, reqfn))
if "\nSuccessfully installed " not in out:
sys.stderr.write("Installing pip requires for %s:%s "
"failed.\n%s\n" %
(project, branch, out))
print("pip install did not indicate success")
print("cached:\n%s" % freeze)
else:
freeze = self.run_command("%s freeze -l" % pip)
requires = self.find_pkg_info(build)
reqfd = open(reqs, "w")
for line in freeze.split("\n"):
if line.startswith("-e ") or (
"==" in line and " " not in line):
requires.add(line)
for r in requires:
reqfd.write(r + "\n")
reqfd.close()
out = self.run_command(venv_format %
(pip_cache_dir, venv))
if os.path.exists(build):
shutil.rmtree(build)
out = self.run_command(pip_format %
(pip, "--no-install",
pip_cache_dir, build, reqs))
if "\nSuccessfully downloaded " not in out:
sys.stderr.write("Downloading pip requires for "
"%s:%s failed.\n%s\n" %
(project, branch, out))
print("pip install did not indicate success")
print("cached:\n%s" % freeze)
else:
print("no requirements")
shutil.rmtree(workdir)