X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=a2c6da3e25058fe2b0447e1c9836a8aad5a265d5;hb=bafd57c92d85a6c8b2c3fd3dbe30aa3a09f8f620;hp=65702b73db09fab12c7a765829ad7e54efea9147;hpb=cf343b44e356c5f89f673c4331249179c5bd85c9;p=releng%2Fglobal-jjb.git diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh index 65702b73..a2c6da3e 100644 --- a/shell/python-tools-install.sh +++ b/shell/python-tools-install.sh @@ -43,7 +43,6 @@ if [[ ! -f /tmp/pre-build-complete ]]; then echo "Generating Requirements File" cat << 'EOF' > "$requirements_file" -openstacksdk<0.99 python-heatclient python-openstackclient python-magnumclient @@ -60,6 +59,7 @@ yq # remove the workarounds in the future. importlib-resources<2.0.0 # virtualenv 20.0.21 requires importlib-resources<2.0.0 (RELENG-2993) pyparsing<3.0.0 # httplib2 0.20.1 requires pyparsing<3,>=2.4.2 +urllib3~=1.26.15 # python-jenkins-1.8.0 requires urllib3-1.26 EOF #Python 3.5 in Ubuntu 16.04 workaround @@ -76,7 +76,7 @@ EOF # TODO: temporarily pinning setuptools to avoid plugin version format issues # https://github.com/pypa/setuptools/issues/3772#issuecomment-1384342813 python3 -m pip install --quiet --no-warn-script-location --upgrade setuptools==65.7.0 - python3 -m pip install --quiet --no-warn-script-location --upgrade lftools[openstack] + python3 -m pip install --quiet --no-warn-script-location --upgrade lftools[openstack] urllib3~=1.26.15 python3 -m pip install --quiet --no-warn-script-location --upgrade \ --upgrade-strategy eager -r "$requirements_file" # installs are silent, show version details in log