From e7bc12e5cbf9c9abe2ef69ffa3113558d60c88a6 Mon Sep 17 00:00:00 2001
From: Maysa Macedo <maysa.macedo95@gmail.com>
Date: Tue, 5 Jan 2021 22:18:00 -0300
Subject: [PATCH] Fix lower-constraints job

This commit upgrades versions of kuryr-lib, MarkupSafe and
pyroute, which were required for the new pip resolver.

Change-Id: I214bcb70d05c871dc7e35ce1d0d861911f728650
---
 lower-constraints.txt | 8 +++-----
 requirements.txt      | 2 +-
 tox.ini               | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 435952ae..81f31cf5 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -40,11 +40,10 @@ jsonpointer==2.0
 jsonschema==3.2.0
 keystoneauth1==3.4.0
 kombu==4.1.0
-kuryr-lib==0.5.0
+kuryr-lib==0.7.0
 linecache2==1.0.0
 Mako==1.0.7
-MarkupSafe==1.0
-mccabe==0.2.1
+MarkupSafe==1.1.0
 monotonic==1.4
 mox3==0.25.0
 msgpack==0.5.6
@@ -83,7 +82,7 @@ Pygments==2.2.0
 pyinotify==0.9.6
 pyparsing==2.2.0
 pyperclip==1.6.0
-pyroute2==0.5.0
+pyroute2==0.5.2
 python-dateutil==2.7.0
 python-editor==1.0.3
 python-keystoneclient==3.15.0
@@ -106,7 +105,6 @@ SQLAlchemy==1.2.5
 sqlalchemy-migrate==0.11.0
 sqlparse==0.2.4
 statsd==3.2.2
-stestr==2.0.0
 stevedore==1.28.0
 Tempita==0.5.2
 tenacity==4.9.0
diff --git a/requirements.txt b/requirements.txt
index 93758169..44bbf97c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
 Babel!=2.4.0,>=2.3.4 # BSD
 Flask!=0.11,>=0.10 # BSD
 jsonschema>=3.2.0 # MIT
-kuryr-lib>=0.5.0 # Apache-2.0
+kuryr-lib>=0.7.0 # Apache-2.0
 neutron-lib>=1.13.0 # Apache-2.0
 os-client-config>=1.28.0 # Apache-2.0
 oslo.concurrency>=3.25.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 7dcfac8e..1bf9f59b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,10 +11,11 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          PYTHONWARNINGS=default::DeprecationWarning
 usedevelop = True
-install_command =
-    pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+install_command = pip install {opts} {packages}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+
 whitelist_externals = sh
                       find
 commands = find . -type f -name "*.py[c|o]" -delete