From 70dc3e4f711088e0cc9f0a92706fee3cb0757bac Mon Sep 17 00:00:00 2001
From: Guillaume DeMengin <gdemengin@gmail.com>
Date: Sat, 26 Nov 2022 19:21:23 +0100
Subject: [PATCH] Fix CI tests

Adjust some of the dependencies.

multi_key_dict is not shipped by OpenStack Zuul templates
`build-openstack-docs-pti` or `openstack-cover-jobs` we thus need to
depend on `requirements.txt`.

setuptools v66.0.0 removed support for PEP 440 non-conforming versions.
It provides pkg_resources which we use in PluginVersion.

Tox `whitelist_externals` has been renamed `allowlist_externals`.

Signed-off-by: Antoine Musso <hashar@free.fr>
Change-Id: Ie791c2bb0e7b3784913f45768d2f3db4c66ccae5
---
 bindep.txt            | 1 -
 requirements.txt      | 2 ++
 test-requirements.txt | 3 ++-
 tox.ini               | 5 +++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index 57cd962..e9d4efd 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -4,7 +4,6 @@ build-essential [platform:dpkg]
 gcc [platform:rpm]
 pypy [test]
 pypy-dev [test]
-python-dev [platform:dpkg]
 python-devel [platform:rpm]
 python3-dev [platform:dpkg]
 python3-devel [platform:fedora]
diff --git a/requirements.txt b/requirements.txt
index 5c014cc..da41145 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,5 @@
+# Setuptools removed support for PEP 440 non-conforming versions
+setuptools<66
 six>=1.3.0
 pbr>=0.8.2
 multi_key_dict
diff --git a/test-requirements.txt b/test-requirements.txt
index c32157f..483c7aa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,8 @@ mock
 unittest2
 python-subunit
 requests-mock>=1.4.0
-requests-kerberos
+requests-kerberos<=0.12.0;python_version<'3.6'
+requests-kerberos;python_version>='3.6'
 sphinx>=1.6.0,<2.0.0;python_version=='2.7'  # BSD
 sphinx>=1.6.0;python_version>='3.4'  # BSD
 stestr>=2.0.0,!=3.0.0
diff --git a/tox.ini b/tox.ini
index 9053c89..b1c2032 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,12 +9,13 @@ setenv =
          VIRTUAL_ENV={envdir}
 usedevelop = True
 install_command = pip install {opts} {packages}
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands =
     - find . -type f -name "*.pyc" -delete
     - find . -type d -name "__pycache__" -delete
     stestr run --slowest {posargs}
-whitelist_externals =
+allowlist_externals =
     bash
     find