summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-04-30 09:41:59 +0000
committerGerrit Code Review <review@openstack.org>2023-04-30 09:41:59 +0000
commit5e6fa6ef3060af766231bafbd756401d4af9ee84 (patch)
tree0b56c11cee1baecd286eb63ec27b57d460a9b4c6
parentfbd13502292edc7ea2ff158f73c84c075ba23fd1 (diff)
parent153d4d8385fa8c39ea0f491b4b5bb0da7da43575 (diff)
downloadironic-5e6fa6ef3060af766231bafbd756401d4af9ee84.tar.gz
Merge "Upgrade to latest hacking - v6"
-rw-r--r--ironic/drivers/base.py2
-rw-r--r--ironic/drivers/modules/drac/raid.py2
-rw-r--r--ironic/hacking/checks.py2
-rw-r--r--tox.ini2
4 files changed, 4 insertions, 4 deletions
diff --git a/ironic/drivers/base.py b/ironic/drivers/base.py
index 4e2928907..953ac056e 100644
--- a/ironic/drivers/base.py
+++ b/ironic/drivers/base.py
@@ -1662,7 +1662,7 @@ class NetworkInterface(BaseInterface):
"""
def need_power_on(self, task):
- """Check if ironic node must be powered on before applying network changes
+ """Check if node must be powered on before applying network changes
:param task: A TaskManager instance.
:returns: Boolean.
diff --git a/ironic/drivers/modules/drac/raid.py b/ironic/drivers/modules/drac/raid.py
index 8bad02bba..404222f5d 100644
--- a/ironic/drivers/modules/drac/raid.py
+++ b/ironic/drivers/modules/drac/raid.py
@@ -1022,7 +1022,7 @@ def _commit_to_controllers(node, controllers, substep="completed"):
# all realtime controllers
all_realtime = all(
(cntlr['is_reboot_required'] == optional)
- and not(cntlr.get('is_ehba_mode'))
+ and not (cntlr.get('is_ehba_mode'))
for cntlr in controllers)
# check any controller with ehba mode
diff --git a/ironic/hacking/checks.py b/ironic/hacking/checks.py
index 6c5b49776..57a3cbfe8 100644
--- a/ironic/hacking/checks.py
+++ b/ironic/hacking/checks.py
@@ -51,4 +51,4 @@ def check_explicit_underscore_import(logical_line, filename):
UNDERSCORE_IMPORT_FILES.append(filename)
elif (translated_log.match(logical_line)
or string_translation.match(logical_line)):
- yield(0, "N323: Found use of _() without explicit import of _!")
+ yield (0, "N323: Found use of _() without explicit import of _!")
diff --git a/tox.ini b/tox.ini
index 1fa446d66..bd564415b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,7 @@ commands = {toxinidir}/tools/states_to_dot.py -f {toxinidir}/doc/source/images/s
[testenv:pep8]
usedevelop = False
deps=
- hacking>=4.1.0,<5.0.0 # Apache-2.0
+ hacking~=6.0.0 # Apache-2.0
doc8>=0.6.0 # Apache-2.0
pycodestyle>=2.0.0,<3.0.0 # MIT
flake8-import-order>=0.17.1 # LGPLv3