From 48c51396e3abffbc7b8ea2b53bb98a64c62102b7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 21 Sep 2024 12:30:20 +0900 Subject: [PATCH] Bump hacking hacking 3.2.x is quite old. Bump it to the version currently used in most of the neutron repos. Change-Id: I8f1b4750be673edc054b79be1aa19e57beb23aab --- neutron_dynamic_routing/db/bgp_db.py | 2 -- requirements.txt | 4 ---- test-requirements.txt | 8 ++------ tox.ini | 3 ++- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/neutron_dynamic_routing/db/bgp_db.py b/neutron_dynamic_routing/db/bgp_db.py index 8063c776..41d50f81 100644 --- a/neutron_dynamic_routing/db/bgp_db.py +++ b/neutron_dynamic_routing/db/bgp_db.py @@ -15,7 +15,6 @@ import itertools import netaddr - from neutron.db import l3_dvr_db from neutron.db.models import address_scope as address_scope_db from neutron.db.models import l3 as l3_db @@ -25,7 +24,6 @@ from neutron.objects import ports from neutron.objects import subnet as subnet_obj from neutron.objects import subnetpool as subnetpool_obj from neutron.plugins.ml2 import models as ml2_models - from neutron_lib.api.definitions import bgp as bgp_ext from neutron_lib.api import validators from neutron_lib import constants as lib_consts diff --git a/requirements.txt b/requirements.txt index c5d78397..28653b34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,6 @@ # Requirements lower bounds listed here are our best effort to keep them up to # date but we do not test them so no guarantee of having them all correct. If # you find any incorrect lower bounds, let us know or propose a fix. - -# 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. pbr!=2.1.0,>=2.0.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 1e778359..4953e43f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,11 +1,7 @@ -# 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>=3.2.0,<3.3.0 # Apache-2.0 - +hacking>=6.1.0,<6.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -flake8-import-order==0.12 # LGPLv3 +flake8-import-order>=0.18.0,<0.19.0 # LGPLv3 python-subunit>=1.0.0 # Apache-2.0/BSD oslo.concurrency>=3.26.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 8a6d24c2..18124268 100644 --- a/tox.ini +++ b/tox.ini @@ -74,6 +74,7 @@ commands = # E129 visually indented line with same indent as next logical line # E265 block comment should start with ‘# ‘ # H405 multi line docstring summary not separated with an empty line +# I202 Additional newline in a group of imports # TODO(marun) H404 multi line docstring should start with a summary # N530 direct neutron imports not allowed # TODO(ihrachys) -- reenable N537 when new neutron-lib release is available @@ -83,7 +84,7 @@ commands = # W504 line break after binary operator # (W503 and W504 are incompatible and we need to choose one of them. # Existing codes follows W503, so we disable W504.) -ignore = E125,E126,E128,E129,E265,H404,H405,N530,N537,W504 +ignore = E125,E126,E128,E129,E265,H404,H405,I202,N530,N537,W504 enable-extensions=H106,H203 show-source = true exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,.ropeproject,rally-scenarios