From 86545fcac788bbbfeca76c9d7f4f76cf6c8bd430 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Wed, 19 Oct 2022 10:16:49 -0600 Subject: [PATCH] Disable pip version check --- images/capi/hack/ensure-ansible-windows.sh | 8 ++++---- images/capi/hack/ensure-ansible.sh | 2 +- images/capi/hack/ensure-azure-cli.sh | 2 +- images/capi/hack/utils.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/capi/hack/ensure-ansible-windows.sh b/images/capi/hack/ensure-ansible-windows.sh index 3b859151e8..6c8fbab7a5 100755 --- a/images/capi/hack/ensure-ansible-windows.sh +++ b/images/capi/hack/ensure-ansible-windows.sh @@ -27,7 +27,7 @@ _version="0.4.2" if [[ ${HOSTOS} == "darwin" ]]; then echo "IMPORTANT: Winrm connection plugin for Ansible on MacOS causes connection issues." echo "See https://docs.ansible.com/ansible/latest/user_guide/windows_winrm.html#what-is-winrm for more details." - echo "To fix the issue provide the enviroment variable 'no_proxy=*'" + echo "To fix the issue provide the enviroment variable 'no_proxy=*'" echo "Example call to build Windows images on MacOS: 'no_proxy=* make build-'" fi @@ -35,8 +35,8 @@ fi # script is located. cd "$(dirname "${BASH_SOURCE[0]}")/.." -if pip3 show pywinrm >/dev/null 2>&1; then exit 0; fi +if pip3 show --disable-pip-version-check pywinrm >/dev/null 2>&1; then exit 0; fi ensure_py3 -pip3 install --user "pywinrm==${_version}" -if ! pip3 show pywinrm ; then exit 1; fi +pip3 install --disable-pip-version-check --user "pywinrm==${_version}" +if ! pip3 show --disable-pip-version-check pywinrm ; then exit 1; fi diff --git a/images/capi/hack/ensure-ansible.sh b/images/capi/hack/ensure-ansible.sh index 9d4671c50f..8bf4a10079 100755 --- a/images/capi/hack/ensure-ansible.sh +++ b/images/capi/hack/ensure-ansible.sh @@ -31,7 +31,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")/.." if ! command -v ansible >/dev/null 2>&1; then ensure_py3 - pip3 install --user "ansible-core==${_version}" + pip3 install --disable-pip-version-check --user "ansible-core==${_version}" ensure_py3_bin ansible ensure_py3_bin ansible-playbook fi diff --git a/images/capi/hack/ensure-azure-cli.sh b/images/capi/hack/ensure-azure-cli.sh index e2a44241a9..512ba52268 100755 --- a/images/capi/hack/ensure-azure-cli.sh +++ b/images/capi/hack/ensure-azure-cli.sh @@ -32,5 +32,5 @@ if command -v az >/dev/null 2>&1; then exit 0; fi ensure_py3 pip install -U pip setuptools -pip3 install --user "azure-cli==${_version}" +pip3 install --disable-pip-version-check --user "azure-cli==${_version}" ensure_py3_bin az azure-cli diff --git a/images/capi/hack/utils.sh b/images/capi/hack/utils.sh index 3f747065da..cfea5db00e 100755 --- a/images/capi/hack/utils.sh +++ b/images/capi/hack/utils.sh @@ -75,7 +75,7 @@ ensure_py3_bin() { if ! command -v "${1}" >/dev/null 2>&1; then echo "User's Python3 binary directory must be in \$PATH" 1>&2 echo "Location of package is:" 1>&2 - pip3 show ${2:-$1} | grep "Location" + pip3 show --disable-pip-version-check ${2:-$1} | grep "Location" echo "\$PATH is currently: $PATH" 1>&2 exit 1 fi