From fc80ae3738c074e3ef84be810fffec5d45a58653 Mon Sep 17 00:00:00 2001
From: Karla Felix <karla.karolinenogueirafelix@windriver.com>
Date: Wed, 6 Jul 2022 14:55:53 -0400
Subject: [PATCH] Remove --use-deprecated legacy-resolver flag

The pip team is planning to depreciate the
'--use-deprecated legacy-resolver'install option.
While a firm date has yet to be set, We need to be
ready for the change.

Test Plan*:

PASS: Verified that tox runs without issues
PASS: Generate Vault package.
PASS: Upload and apply Vault package and check if pod
      is running.

Note(*): Tested on kubernetes 1.21.8

Closes-bug:1966076

Signed-off-by: Karla Felix <karla.karolinenogueirafelix@windriver.com>
Change-Id: I582378ff198430c182fd9197976e9041f2910680
---
 python-k8sapp-vault/k8sapp_vault/requirements.txt      | 4 ++--
 python-k8sapp-vault/k8sapp_vault/test-requirements.txt | 2 +-
 python-k8sapp-vault/k8sapp_vault/tox.ini               | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/python-k8sapp-vault/k8sapp_vault/requirements.txt b/python-k8sapp-vault/k8sapp_vault/requirements.txt
index e71df21..574fa02 100644
--- a/python-k8sapp-vault/k8sapp_vault/requirements.txt
+++ b/python-k8sapp-vault/k8sapp_vault/requirements.txt
@@ -1,2 +1,2 @@
-pbr>=2.0.0
-PyYAML==3.10
+pbr==5.1.3
+PyYAML>=3.13
diff --git a/python-k8sapp-vault/k8sapp_vault/test-requirements.txt b/python-k8sapp-vault/k8sapp_vault/test-requirements.txt
index 7fc556d..4f12b3e 100644
--- a/python-k8sapp-vault/k8sapp_vault/test-requirements.txt
+++ b/python-k8sapp-vault/k8sapp_vault/test-requirements.txt
@@ -14,7 +14,7 @@ oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testrepository>=0.0.18
 testtools>=2.2.0 # MIT
-tempest-lib<0.5.0,>=0.4.0
+tempest-lib>=0.4.0
 ipaddr
 pytest
 pyudev
diff --git a/python-k8sapp-vault/k8sapp_vault/tox.ini b/python-k8sapp-vault/k8sapp_vault/tox.ini
index ea5dee7..eb1a482 100644
--- a/python-k8sapp-vault/k8sapp_vault/tox.ini
+++ b/python-k8sapp-vault/k8sapp_vault/tox.ini
@@ -21,8 +21,7 @@ sitepackages = False
 whitelist_externals = bash
                       find
 
-install_command = pip install --use-deprecated legacy-resolver \
-    -v -v -v \
+install_command = pip install -v -v -v \
     -c{toxinidir}/upper-constraints.txt \
     -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
     {opts} {packages}
@@ -81,8 +80,7 @@ commands =
 
 [testenv:py39]
 basepython = python3.9
-install_command = pip install \
-    -v -v -v \
+install_command = pip install -v -v -v \
     --use-deprecated legacy-resolver \
     -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
     {opts} {packages}