From 58340e6272cc3e44e1992d1906af87bd8331a517 Mon Sep 17 00:00:00 2001 From: asarfaty Date: Thu, 10 Dec 2020 09:17:28 +0200 Subject: [PATCH] Fix requirements Change-Id: If2a32b0bbf6bbcdc3b911224adb8943a7a34897b --- doc/requirements.txt | 4 ++-- lower-constraints.txt | 23 ++++++++++------------- requirements.txt | 12 ++++++------ test-requirements.txt | 8 ++------ tox.ini | 3 ++- vmware_nsxlib/v3/cluster.py | 1 + 6 files changed, 23 insertions(+), 28 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 4a140912..3ccdeaeb 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. sphinx>=2.0.0,!=2.1.0 # BSD -oslosphinx>=4.7.0 # Apache-2.0 +sphinx_feature_classification>=1.0.0 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 +testresources>=2.0.0 # Apache-2.0/BSD diff --git a/lower-constraints.txt b/lower-constraints.txt index 374c1ec1..9cb8be55 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,29 +1,26 @@ bandit==1.1.0 coverage==4.0 -decorator==4.3.0 +decorator==4.4.1 eventlet==0.24.1 fixtures==3.0.0 -flake8==2.6.2 -flake8-import-order==0.12 -hacking>=1.1.0 # Apache-2.0 +flake8-import-order==0.18.1 +hacking>=3.0.1 # Apache-2.0 netaddr==0.7.18 openstackdocstheme==1.18.1 -oslo.i18n==3.15.3 -oslo.log==3.36.0 +oslo.i18n==3.20.0 +oslo.log==4.2.1 oslo.serialization==2.28.1 oslo.service==1.31.0 -oslo.utils==3.33.0 +oslo.utils==4.4.0 oslotest==3.2.0 pbr==4.0.0 -pyOpenSSL==17.1.0 +pyOpenSSL==19.1.0 python-subunit==1.0.0 -pylint==1.7.1 -reno==2.5.0 requests-mock==1.2.0 -sphinx==1.6.5 +sphinx==2.0.0 +sphinx_feature_classification==1.0.0 stestr==1.0.0 -tempest==17.1.0 -tenacity==5.0.1 +tenacity==6.0.0 testresources==2.0.0 testtools==2.2.0 testscenarios==0.4 diff --git a/requirements.txt b/requirements.txt index d934ad61..cf19f83f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,13 +4,13 @@ pbr>=4.0.0 # Apache-2.0 -decorator>=4.3.0 # BSD +decorator>=4.4.1 # BSD eventlet>=0.24.1 # MIT netaddr>=0.7.18 # BSD -tenacity>=5.0.1 # Apache-2.0 -oslo.i18n>=3.15.3 # Apache-2.0 -oslo.log>=3.36.0 # Apache-2.0 +tenacity>=6.0.0 # Apache-2.0 +oslo.i18n>=3.20.0 # Apache-2.0 +oslo.log>=4.2.1 # Apache-2.0 oslo.serialization>=2.28.1 # Apache-2.0 oslo.service>=1.31.0 # Apache-2.0 -oslo.utils>=3.33.0 # Apache-2.0 -pyOpenSSL>=17.1.0 # Apache-2.0 +oslo.utils>=4.4.0 # Apache-2.0 +pyOpenSSL>=19.1.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index d37e0145..730d4771 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,19 +1,15 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. - -hacking>=1.1.0 # Apache-2.0 - +hacking>=3.0.1,<3.1.0 # Apache-2.0 bandit!=1.6.0,>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.00 fixtures>=3.0.0 # Apache-2.0/BSD -flake8-import-order==0.12 # LGPLv3 +flake8-import-order==0.18.1 # LGPLv3 python-subunit>=1.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testresources>=2.0.0 # Apache-2.0/BSD testtools>=2.2.0 # MIT testscenarios>=0.4 # Apache-2.0/BSD -tempest>=17.1.0 # Apache-2.0 -pylint==1.7.6 # GPLv2 requests-mock>=1.2.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index ba11f73e..55266e54 100644 --- a/tox.ini +++ b/tox.ini @@ -95,7 +95,8 @@ commands = sphinx-build -b html doc/source doc/build/html # N530 direct neutron imports not allowed # W504 line break after binary operator # N531 translations hints -ignore = N530,E125,E129,E741,N531,W504 +# I202 Additional newline in a group of imports +ignore = N530,E125,E129,E741,N531,W504,I202 show-source = true builtins = _ exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject diff --git a/vmware_nsxlib/v3/cluster.py b/vmware_nsxlib/v3/cluster.py index 9abd42b9..874351d3 100644 --- a/vmware_nsxlib/v3/cluster.py +++ b/vmware_nsxlib/v3/cluster.py @@ -24,6 +24,7 @@ import logging import re import time from urllib import parse as urlparse + import urllib3 import eventlet