From ee647a7552647767815ea2f7faebab6aca0501a3 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 21 Jul 2021 11:14:00 +0200 Subject: [PATCH 1/2] Removed unneeded dependency to distro-info distro-info hasn't been maintained for 8 years and pip is now failing to fetch it on Python 3.8. This dependency seems to have been introduced by accident in 22e7ffc. --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index adec5bc..1621491 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,7 +41,6 @@ python-novaclient python-octaviaclient python-swiftclient tenacity -distro-info paramiko # Documentation requirements From e693fc1840471bb7e39f473d839be0941358101e Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 28 Jul 2021 16:52:33 +0200 Subject: [PATCH 2/2] Nail pip 20.2.3 Co-authored-by: Alex Kavanagh --- pip.sh | 4 ++++ tox.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 pip.sh diff --git a/pip.sh b/pip.sh new file mode 100755 index 0000000..cdd3588 --- /dev/null +++ b/pip.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +pip install pip==20.2.3 +pip install "$@" diff --git a/tox.ini b/tox.ini index aea173f..890b193 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ minversion = 3.2.0 setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 install_command = - pip install {opts} {packages} + {toxinidir}/pip.sh install {opts} {packages} commands = nosetests --with-coverage --cover-package=zaza.openstack {posargs} {toxinidir}/unit_tests