Merge "Override the pip index used for the wheel build" into stable/queens

This commit is contained in:
Zuul 2018-04-25 11:11:12 +00:00 committed by Gerrit Code Review
commit 75a87bf499
2 changed files with 1 additions and 5 deletions

View File

@ -74,7 +74,7 @@ repo_build_venv_rebuild: no
repo_build_venv_timeout: 30
# Optionally set this to change the default index from pypi to an alternative
#repo_build_pip_default_index: "https://pypi.python.org/simple"
repo_build_pip_default_index: "https://pypi.python.org/simple"
# Optionally set this to a list of extra indexes to be used when building wheels
#repo_build_pip_extra_indexes:

View File

@ -37,10 +37,8 @@
--download {{ repo_build_output }}
--no-binary :all:
--constraint {{ repo_build_release_path }}/requirements_constraints.txt
{% if repo_build_pip_default_index is defined %}
--index-url {{ repo_build_pip_default_index }}
--trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
{% endif %}
{% if repo_build_pip_extra_indexes is defined %}
--extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }}
--trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }}
@ -63,10 +61,8 @@
{% if repo_build_pip_no_binary is defined %}
--no-binary {{ repo_build_pip_no_binary | join(' --no-binary ') }}
{% endif %}
{% if repo_build_pip_default_index is defined %}
--index-url {{ repo_build_pip_default_index }}
--trusted-host {{ repo_build_pip_default_index | netloc_no_port }}
{% endif %}
{% if repo_build_pip_extra_indexes is defined %}
--extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }}
--trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }}