From ede964b1832c1fdfe2cf5db675c49734fec02900 Mon Sep 17 00:00:00 2001 From: Karla Felix Date: Fri, 24 Jun 2022 10:33:29 -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 auditd package. PASS: Install audit package and check if pod is running. PASS: Check auditable events. Closes-Bug: 1966069 Signed-off-by: Karla Felix Change-Id: Icbe2fb324f220de194dc30686b65ad2d0d466b2d --- python-k8sapp-auditd/k8sapp_auditd/requirements.txt | 2 +- python-k8sapp-auditd/k8sapp_auditd/tox.ini | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/python-k8sapp-auditd/k8sapp_auditd/requirements.txt b/python-k8sapp-auditd/k8sapp_auditd/requirements.txt index 5bc15a1..43f8edc 100644 --- a/python-k8sapp-auditd/k8sapp_auditd/requirements.txt +++ b/python-k8sapp-auditd/k8sapp_auditd/requirements.txt @@ -1,2 +1,2 @@ pbr>=0.5 -PyYAML==3.10 +PyYAML>=3.10 diff --git a/python-k8sapp-auditd/k8sapp_auditd/tox.ini b/python-k8sapp-auditd/k8sapp_auditd/tox.ini index 6713c1b..c59c71a 100644 --- a/python-k8sapp-auditd/k8sapp_auditd/tox.ini +++ b/python-k8sapp-auditd/k8sapp_auditd/tox.ini @@ -22,8 +22,7 @@ basepython = python3 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} @@ -85,8 +84,7 @@ commands = [testenv:py39] basepython = python3.9 -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/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \ {opts} {packages}