From d2652a7b7e8e114a16b2cebdb67c58b8ae5353a3 Mon Sep 17 00:00:00 2001
From: Boden R <bodenvmw@gmail.com>
Date: Fri, 14 Dec 2018 14:52:11 -0700
Subject: [PATCH] fix lower constraints

This patch adjusts the lower constraints and requirements to ensure
the lower-constraints job passes.

Change-Id: I99121a93c56f53cfe13ce519e66af9139a1678f3
---
 lower-constraints.txt | 28 ++++++++++------------------
 requirements.txt      | 13 ++++++++-----
 test-requirements.txt |  2 +-
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 3678947761..00a8b94028 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -3,7 +3,6 @@ alembic==0.8.10
 amqp==2.1.1
 appdirs==1.3.0
 asn1crypto==0.23.0
-astroid==1.3.8
 Babel==2.3.4
 beautifulsoup4==4.6.0
 cachetools==2.0.0
@@ -12,9 +11,8 @@ cliff==2.8.0
 cmd2==0.8.0
 contextlib2==0.4.0
 coverage==4.0
-cryptography==2.1
 debtcollector==1.2.0
-decorator==3.4.0
+decorator==4.3.0
 deprecation==1.0
 docutils==0.11
 dogpile.cache==0.6.2
@@ -38,7 +36,6 @@ jmespath==0.9.0
 jsonpatch==1.16
 jsonpointer==1.13
 jsonschema==2.6.0
-keystoneauth1==3.4.0
 keystonemiddleware==4.17.0
 kombu==4.0.0
 linecache2==1.0.0
@@ -48,7 +45,6 @@ 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
@@ -57,12 +53,10 @@ netifaces==0.10.4
 neutron-lib==1.21.0
 octavia==3.0.0
 openstackdocstheme==1.18.1
-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
+osc-lib==1.10.0
 oslo.cache==1.26.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
@@ -73,11 +67,11 @@ oslo.log==3.36.0
 oslo.messaging==5.29.0
 oslo.middleware==3.31.0
 oslo.policy==1.30.0
-oslo.privsep==1.23.0
+oslo.privsep==1.29.0
 oslo.reports==1.18.0
 oslo.rootwrap==5.8.0
 oslo.serialization==2.18.0
-oslo.service==1.24.0
+oslo.service==1.31.0
 oslo.utils==3.33.0
 oslo.versionedobjects==1.31.2
 oslo.vmware==2.17.0
@@ -89,15 +83,13 @@ paramiko==2.0.0
 Paste==2.0.2
 PasteDeploy==1.5.0
 pbr==2.0.0
-pecan==1.0.0
 pep8==1.5.7
 pika==0.10.0
 pika-pool==0.1.3
 positional==1.2.1
-prettytable==0.7.1
+prettytable==0.7.2
 psycopg2==2.6.2
 psutil==3.2.2
-pyasn1==0.1.8
 pycadf==1.1.0
 pycodestyle==2.3.1
 pycparser==2.18
@@ -105,12 +97,10 @@ pyflakes==0.8.1
 Pygments==2.2.0
 pyinotify==0.9.6
 pylint==1.7.1
-pyparsing==2.1.0
 pyperclip==1.5.27
 python-dateutil==2.5.3
 python-designateclient==2.7.0
 python-editor==1.0.3
-python-keystoneclient==3.8.0
 python-mimeparse==1.6.0
 python-neutronclient==6.7.0
 python-novaclient==9.1.0
@@ -126,13 +116,12 @@ requests-mock==1.2.0
 requestsexceptions==1.2.0
 rfc3986==0.3.1
 Routes==2.3.1
-ryu==4.14
 simplejson==3.5.1
 six==1.10.0
 snowballstemmer==1.2.1
 Sphinx==1.6.5
 sphinxcontrib-websupport==1.0.1
-SQLAlchemy==1.0.10
+SQLAlchemy==1.2.0
 sqlalchemy-migrate==0.11.0
 sqlparse==0.2.2
 statsd==3.2.1
@@ -151,8 +140,11 @@ tooz==1.58.0
 unittest2==1.1.0
 urllib3==1.21.1
 vine==1.1.4
-vmware-nsxlib==12.0.0
+vmware-nsxlib==13.0.0
 waitress==1.1.0
 WebOb==1.7.1
 WebTest==2.0.27
 wrapt==1.7.0
+
+# Temporary fix until https://review.openstack.org/#/c/608357 is merged
+ryu==4.30
diff --git a/requirements.txt b/requirements.txt
index 2a8b2428af..77f0d6ebbf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,11 +7,11 @@ eventlet>=0.24.1 # MIT
 httplib2>=0.9.1 # MIT
 netaddr>=0.7.18 # BSD
 tenacity>=4.4.0 # Apache-2.0
-SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
+SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT
 six>=1.10.0 # MIT
 stevedore>=1.20.0 # Apache-2.0
 neutron-lib>=1.21.0 # Apache-2.0
-osc-lib>=1.8.0 # Apache-2.0
+osc-lib>=1.10.0 # Apache-2.0
 python-openstackclient>=3.16.0 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
@@ -20,14 +20,17 @@ oslo.db>=4.27.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
-oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
+oslo.service>=1.31.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 oslo.vmware>=2.17.0 # Apache-2.0
-PrettyTable<0.8,>=0.7.1 # BSD
+PrettyTable<0.8,>=0.7.2 # BSD
 tooz>=1.58.0 # Apache-2.0
-decorator>=3.4.0 # BSD
+decorator>=4.3.0 # BSD
 mock>=2.0.0 # BSD
 
+# Temporary fix until https://review.openstack.org/#/c/608357 is merged
+ryu>=4.30
+
 # These repos are installed from git in OpenStack CI if the job
 # configures them as required-projects:
 neutron>=12.0.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 37dac0b8e0..b3edb4e2d8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,7 @@ mock>=2.0.0 # BSD
 psycopg2>=2.6.2 # LGPL/ZPL
 PyMySQL>=0.7.6 # MIT License
 oslotest>=3.2.0 # Apache-2.0
-oslo.privsep>=1.23.0 # Apache-2.0
+oslo.privsep>=1.29.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=2.0.0 # Apache-2.0/BSD