Override the pip index used for the wheel build

When doing the wheel build we need to ensure that we make
use of the pypi mirror directly.

When upgrading, if we leave it to the pip.conf file contents,
it will only use the contents of the pypiserver which locks
it down to the wheels built for the version we're upgrading
from. The wheel build therefore fails.

Leaving the pip.conf config in place is still good for
ensuring that anything installed on the repo server later uses
the pypiserver contents.

Change-Id: I5d1f33832c9738683b49384ea5ebfb571b526a81
This commit is contained in:
Jesse Pretorius 2018-04-20 14:20:10 +01:00
parent 3f96d62164
commit a25d1b41db
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

@ -36,10 +36,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 ') }}
@ -61,10 +59,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 ') }}