opendev/pypi-mirror
Code Issues Proposed changes

Update build tools and fix link paths

Browse Source 
The tarball builds were using the wheelhouse paths
for find_links, that should have been using the
pip download cache path.

The pre-build upgrade now upgrades distribute, pbr,
and setuptools to handle the ;environment_factor
style requirements.

Change-Id: I68d3e090779d9b73613e3aab7fe9c7ee9513e45d
This commit is contained in:
Nikki Heald 2015-07-15 09:27:21 +01:00
parent 67e44675f6
commit 392a70d3b5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pypi_mirror/cmd/run_mirror.py
View File

@ -257,7 +257,11 @@ 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))
for requirement in ['"pip>=6.0"', "wheel", "virtualenv"]: build_tools = [
"pip", "wheel", "virtualenv", "setuptools", "pbr",
"distribute"]
for requirement in build_tools:
for extra_args in ("", "--no-use-wheel"): for extra_args in ("", "--no-use-wheel"):
self.run_command( self.run_command(
upgrade_format % dict( upgrade_format % dict(
@ -265,14 +269,14 @@ class Mirror(object):
download_cache=pip_cache_dir, 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>=6.0"', "setuptools", "distribute", for requirement in build_tools:
"virtualenv"]:
self.run_command( self.run_command(
wheel_format % dict( wheel_format % dict(
pip=pip, download_cache=pip_cache_dir, pip=pip, download_cache=pip_cache_dir,
find_links=wheelhouse, wheel_dir=wheelhouse, find_links=wheelhouse, wheel_dir=wheelhouse,
requirement=requirement)) requirement=requirement))
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,
@ -290,7 +294,7 @@ class Mirror(object):
pip_format % dict( pip_format % dict(
pip=pip, extra_args="", pip=pip, extra_args="",
download_cache=pip_cache_dir, build_dir=build, download_cache=pip_cache_dir, build_dir=build,
find_links=wheelhouse, requirements_file=reqfn)) find_links=pip_cache_dir, requirements_file=reqfn))
if "\nSuccessfully installed " not in out: if "\nSuccessfully installed " not in out:
sys.stderr.write("Installing pip requires for %s:%s " sys.stderr.write("Installing pip requires for %s:%s "
"failed.\n%s\n" % "failed.\n%s\n" %
@ -329,7 +333,7 @@ class Mirror(object):
pip_format % dict( pip_format % dict(
pip=pip, extra_args="--no-install", pip=pip, extra_args="--no-install",
download_cache=pip_cache_dir, build_dir=build, download_cache=pip_cache_dir, build_dir=build,
find_links=wheelhouse, requirements_file=reqs)) find_links=pip_cache_dir, requirements_file=reqs))
if "\nSuccessfully downloaded " not in out: if "\nSuccessfully downloaded " not in out:
sys.stderr.write("Downloading pip requires for " sys.stderr.write("Downloading pip requires for "
"%s:%s failed.\n%s\n" % "%s:%s failed.\n%s\n" %