From 8d34c6ae3bf30fce7951f38d8dea26a80e9c396c Mon Sep 17 00:00:00 2001
From: asarfaty <asarfaty@vmware.com>
Date: Mon, 7 Dec 2020 17:32:29 +0200
Subject: [PATCH] Fix Ussuri branch requirements

Change-Id: Ieb56bd81998e82494aa8d3a836ae1344e607dade
---
 .pylintrc             | 15 +++++++++++++++
 lower-constraints.txt |  7 ++++---
 requirements.txt      |  2 +-
 test-requirements.txt |  3 ++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index ae644cd99e..588fac5ded 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -95,6 +95,21 @@ disable=
  cyclic-import,
  no-name-in-module,
  bad-super-call
+# new for python3 version of pylint
+ consider-using-set-comprehension,
+ unnecessary-pass,
+ useless-object-inheritance,
+ raise-missing-from,
+ super-with-arguments,
+ inconsistent-return-statements,
+ unnecessary-comprehension,
+ consider-using-in,
+ consider-using-get,
+ assignment-from-none,
+ invalid-overridden-method,
+ raising-format-tuple,
+ comparison-with-callable,
+ bad-super-call
 
 [BASIC]
 # Variable names can be 1 to 31 characters long, with lowercase and underscores
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 0fe306206e..945f84bcfa 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -8,10 +8,11 @@ flake8-import-order==0.12
 flake8==2.6.2
 hacking==1.1.0
 httplib2==0.9.1
+isort==4.3.21
 kombu==4.0.0
 mock==2.0.0
 netaddr==0.7.18
-neutron-lib==2.0.0
+neutron-lib==2.2.0
 octavia-lib==1.3.1
 openstackdocstheme==1.18.1
 oslo.concurrency==3.26.0
@@ -35,7 +36,7 @@ pika==0.10.0
 prettytable==0.7.2
 psycopg2==2.7
 PyMySQL==0.7.6
-pylint==1.7.1
+pylint==1.9.2
 python-openstackclient==4.0.0
 reno==2.5.0
 requests==2.14.2
@@ -47,4 +48,4 @@ stevedore==1.20.0
 tenacity==5.0.2
 testtools==2.2.0
 tooz==1.58.0
-vmware-nsxlib==15.0.1
+vmware-nsxlib==16.0.0
diff --git a/requirements.txt b/requirements.txt
index ce1c512b38..6788be72ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ tenacity>=5.0.2 # Apache-2.0
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT
 six>=1.11.0 # MIT
 stevedore>=1.20.0 # Apache-2.0
-neutron-lib>=2.0.0 # Apache-2.0
+neutron-lib>=2.2.0 # Apache-2.0
 osc-lib>=1.14.0 # Apache-2.0
 octavia-lib>=1.3.1 # Apache-2.0
 python-openstackclient>=4.0.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index aa45eff896..a2b0ccfa97 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,10 +7,11 @@ coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 flake8>=2.6.0
 flake8-import-order==0.12 # LGPLv3
+isort==4.3.21 # MIT
 mock>=2.0.0 # BSD
 psycopg2>=2.7 # LGPL/ZPL
 PyMySQL>=0.7.6 # MIT License
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
-pylint==1.7.6 # GPLv2
+pylint==1.9.2 # GPLv2