Skip to content

Commit

Permalink
Disable pip version check
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Oct 19, 2022
1 parent ff401e5 commit 86545fc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions images/capi/hack/ensure-ansible-windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ _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-<target>'"
fi

# Change directories to the parent directory of the one in which this
# 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
2 changes: 1 addition & 1 deletion images/capi/hack/ensure-ansible.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/capi/hack/ensure-azure-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion images/capi/hack/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 86545fc

Please sign in to comment.