From 2efb86b36175ba3f14bf401eaa6622e003119a40 Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Fri, 17 Apr 2020 14:45:22 -0400
Subject: [PATCH] Update requirements and constraints

There were a number of carry-over constraints and
requirements from neutron and networking-ovn that
are not needed for the OVN provider, remove them.

Update tenacity to version 5.0.2 to match octavia-lib,
else running 'tox -e lower-constraints' will fail with
an error locally.

Also removed the install_command directive from
tox.ini since that could lead to requirements
tests not running properly, it is handled internally
by tox versions > 3.0 and we are using 3.1.0.

Change-Id: I72d1ac0294e22ead8d9f38e09bdefc62a3ce50ff
---
 lower-constraints.txt | 29 ++++++++---------------------
 requirements.txt      |  5 ++---
 tox.ini               |  1 -
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index b608988e..2ebe17ce 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,17 +1,15 @@
 alabaster==0.7.10
-alembic==0.8.10
+alembic==0.9.6
 amqp==2.1.1
 appdirs==1.4.3
-asn1crypto==0.23.0
 astroid==2.1.0
-Babel==2.3.4
+bandit==1.1.0
 beautifulsoup4==4.6.0
 cachetools==2.0.0
 cffi==1.7.0
 chardet==3.0.4
 cliff==2.8.0
 cmd2==0.8.0
-contextlib2==0.4.0
 coverage==4.0
 cryptography==2.1
 debtcollector==1.2.0
@@ -20,7 +18,6 @@ deprecation==1.0
 doc8==0.6.0
 docutils==0.11
 dogpile.cache==0.6.2
-dulwich==0.15.0
 eventlet==0.18.2
 extras==1.0.0
 fasteners==0.7.0
@@ -32,7 +29,6 @@ futurist==1.2.0
 greenlet==0.4.10
 hacking==1.1.0
 idna==2.6
-imagesize==0.7.1
 iso8601==0.1.11
 Jinja2==2.10
 jmespath==0.9.0
@@ -43,30 +39,27 @@ keystoneauth1==3.4.0
 keystonemiddleware==4.17.0
 kombu==4.0.0
 linecache2==1.0.0
-logilab-common==1.4.1
 logutils==0.3.5
 Mako==0.4.0
 MarkupSafe==1.0
 mccabe==0.2.1
 mock==2.0.0
 monotonic==0.6
-mox3==0.20.0
 msgpack-python==0.4.0
 munch==2.1.0
 netaddr==0.7.18
 netifaces==0.10.4
-neutron==13.0.0.0b2
+neutron==15.0.0
 neutron-lib==1.28.0
 octavia-lib==1.3.1
 openstackdocstheme==1.20.0
 openstacksdk==0.11.2
 os-client-config==1.28.0
 os-service-types==1.2.0
-os-testr==1.0.0
 os-xenapi==0.3.1
 osc-lib==1.8.0
 oslo.cache==1.26.0
-oslo.concurrency==3.25.0
+oslo.concurrency==3.26.0
 oslo.config==5.2.0
 oslo.context==2.19.2
 oslo.i18n==3.15.3
@@ -77,12 +70,12 @@ oslo.policy==1.30.0
 oslo.privsep==1.23.0
 oslo.reports==1.18.0
 oslo.rootwrap==5.8.0
-oslo.serialization==2.18.0
+oslo.serialization==2.28.1
 oslo.service==1.24.0
 oslo.utils==3.33.0
 oslo.versionedobjects==1.31.2
 oslotest==3.2.0
-osprofiler==1.4.0
+osprofiler==2.3.0
 ovs==2.8.0
 ovsdbapp==0.17.0
 Paste==2.0.2
@@ -92,7 +85,6 @@ pecan==1.0.0
 pep8==1.5.7
 pika==0.10.0
 pika-pool==0.1.3
-positional==1.2.1
 prettytable==0.7.2
 psutil==3.2.2
 pycadf==1.1.0
@@ -102,7 +94,6 @@ pyflakes==0.8.1
 Pygments==2.2.0
 pyinotify==0.9.6
 pylint==2.2.0
-pyOpenSSL==17.1.0
 pyparsing==2.1.0
 pyperclip==1.5.27
 pyroute2==0.4.21
@@ -114,16 +105,14 @@ python-mimeparse==1.6.0
 python-neutronclient==6.7.0
 python-novaclient==9.1.0
 python-subunit==1.0.0
-pytz==2013.6
+pytz==2015.7
 PyYAML==3.12
 reno==2.5.0
 repoze.lru==0.7
 requests==2.14.2
 requestsexceptions==1.2.0
-restructuredtext-lint==1.1.1
 rfc3986==0.3.1
 Routes==2.3.1
-ryu==4.14
 simplejson==3.5.1
 snowballstemmer==1.2.1
 Sphinx==1.6.2
@@ -134,12 +123,10 @@ sqlparse==0.2.2
 statsd==3.2.1
 stestr==1.0.0
 Tempita==0.5.2
-tenacity==4.4.0
-testrepository==0.0.18
+tenacity==5.0.2
 testresources==2.0.0
 testscenarios==0.4
 testtools==2.2.0
-tooz==1.58.0
 tinyrpc==0.6
 traceback2==1.4.0
 unittest2==1.1.0
diff --git a/requirements.txt b/requirements.txt
index b40938a8..8b643816 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,12 +7,11 @@ netaddr>=0.7.18 # BSD
 neutron-lib>=1.28.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
-oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+oslo.serialization>=2.28.1 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 ovs>=2.8.0 # Apache-2.0
 ovsdbapp>=0.17.0 # Apache-2.0
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-tenacity>=4.4.0 # Apache-2.0
-Babel!=2.4.0,>=2.3.4 # BSD
+tenacity>=5.0.2 # Apache-2.0
 octavia-lib>=1.3.1 # Apache-2.0
 python-neutronclient>=6.7.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 63964e97..e7f67fac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,6 @@ ignore_basepython_conflict = True
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
          OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}