From 542b4678709d2adc8ef4da78985bd0722bf3a2ba Mon Sep 17 00:00:00 2001 From: Karla Felix Date: Wed, 6 Jul 2022 15:26:38 -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 ptp-notification package. PASS: Upload and apply ptp-notification package and check if pod is running. Closes-bug:1966073 signed-off-by: Karla Felix Change-Id: I854cfb8b72bb9af069b8c0c378f934cf189c6345 --- .../k8sapp_ptp_notification/requirements.txt | 4 ++-- .../k8sapp_ptp_notification/test-requirements.txt | 6 +++--- .../k8sapp_ptp_notification/tox.ini | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/requirements.txt b/python-k8sapp-ptp-notification/k8sapp_ptp_notification/requirements.txt index e71df21..1499a7c 100644 --- a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/requirements.txt +++ b/python-k8sapp-ptp-notification/k8sapp_ptp_notification/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-ptp-notification/k8sapp_ptp_notification/test-requirements.txt b/python-k8sapp-ptp-notification/k8sapp_ptp_notification/test-requirements.txt index e248a36..9a65221 100644 --- a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/test-requirements.txt +++ b/python-k8sapp-ptp-notification/k8sapp_ptp_notification/test-requirements.txt @@ -12,13 +12,13 @@ passlib>=1.7.0 psycopg2-binary python-subunit>=0.0.18 requests-mock>=0.6.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -oslosphinx<2.6.0,>=2.5.0 # Apache-2.0 +sphinx===1.8.4 +oslosphinx===4.18.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testrepository>=0.0.18 testtools!=1.2.0,>=0.9.36 -tempest-lib<0.5.0,>=0.4.0 +tempest-lib===1.0.0 ipaddr pytest pyudev diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini b/python-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini index d3d81a9..baf7a8d 100644 --- a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini +++ b/python-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini @@ -21,8 +21,7 @@ sitepackages = True 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}