Update hacking for Python3
The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Fix problems found by updated hacking version. Update local hacking checks for new flake8. Remove hacking and friends from lower-constraints, they are not needed in installations. Change-Id: I67e5ca24c550163c218fb06692de0b7c528d8318
This commit is contained in:
parent
69f7455467
commit
1456d8b6f9
@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
from hacking import core
|
||||||
|
|
||||||
mutable_default_args = re.compile(r"^\s*def .+\((.+=\{\}|.+=\[\])")
|
mutable_default_args = re.compile(r"^\s*def .+\((.+=\{\}|.+=\[\])")
|
||||||
|
|
||||||
@ -22,12 +23,13 @@ UNDERSCORE_IMPORT_FILES = []
|
|||||||
string_translation = re.compile(r"[^_]*_\(\s*('|\")")
|
string_translation = re.compile(r"[^_]*_\(\s*('|\")")
|
||||||
translated_log = re.compile(
|
translated_log = re.compile(
|
||||||
r"(.)*LOG\.(audit|error|info|warn|warning|critical|exception)"
|
r"(.)*LOG\.(audit|error|info|warn|warning|critical|exception)"
|
||||||
"\(\s*_\(\s*('|\")")
|
r"\(\s*_\(\s*('|\")")
|
||||||
underscore_import_check = re.compile(r"(.)*import _(.)*")
|
underscore_import_check = re.compile(r"(.)*import _(.)*")
|
||||||
# We need this for cases where they have created their own _ function.
|
# We need this for cases where they have created their own _ function.
|
||||||
custom_underscore_check = re.compile(r"(.)*_\s*=\s*(.)*")
|
custom_underscore_check = re.compile(r"(.)*_\s*=\s*(.)*")
|
||||||
|
|
||||||
|
|
||||||
|
@core.flake8ext
|
||||||
def check_explicit_underscore_import(logical_line, filename):
|
def check_explicit_underscore_import(logical_line, filename):
|
||||||
"""Check for explicit import of the _ function
|
"""Check for explicit import of the _ function
|
||||||
|
|
||||||
@ -50,6 +52,7 @@ def check_explicit_underscore_import(logical_line, filename):
|
|||||||
yield(0, "D703: Found use of _() without explicit import of _!")
|
yield(0, "D703: Found use of _() without explicit import of _!")
|
||||||
|
|
||||||
|
|
||||||
|
@core.flake8ext
|
||||||
def no_log_warn(logical_line):
|
def no_log_warn(logical_line):
|
||||||
"""Disallow 'LOG.warn('
|
"""Disallow 'LOG.warn('
|
||||||
|
|
||||||
@ -63,13 +66,8 @@ def no_log_warn(logical_line):
|
|||||||
yield (0, msg)
|
yield (0, msg)
|
||||||
|
|
||||||
|
|
||||||
|
@core.flake8ext
|
||||||
def no_mutable_default_args(logical_line):
|
def no_mutable_default_args(logical_line):
|
||||||
msg = "K301: Method's default argument shouldn't be mutable!"
|
msg = "K301: Method's default argument shouldn't be mutable!"
|
||||||
if mutable_default_args.match(logical_line):
|
if mutable_default_args.match(logical_line):
|
||||||
yield (0, msg)
|
yield (0, msg)
|
||||||
|
|
||||||
|
|
||||||
def factory(register):
|
|
||||||
register(check_explicit_underscore_import)
|
|
||||||
register(no_mutable_default_args)
|
|
||||||
register(no_log_warn)
|
|
||||||
|
@ -20,12 +20,10 @@ docker==2.4.2
|
|||||||
dogpile.cache==0.6.5
|
dogpile.cache==0.6.5
|
||||||
extras==1.0.0
|
extras==1.0.0
|
||||||
fixtures==3.0.0
|
fixtures==3.0.0
|
||||||
flake8==2.5.5
|
|
||||||
gitdb2==2.0.3
|
gitdb2==2.0.3
|
||||||
gitdb==0.6.4
|
gitdb==0.6.4
|
||||||
GitPython==1.0.1
|
GitPython==1.0.1
|
||||||
graphviz==0.4
|
graphviz==0.4
|
||||||
hacking==1.1.0
|
|
||||||
idna==2.6
|
idna==2.6
|
||||||
iso8601==0.1.12
|
iso8601==0.1.12
|
||||||
Jinja2==2.8
|
Jinja2==2.8
|
||||||
@ -59,7 +57,6 @@ packaging==17.1
|
|||||||
pbr==2.0.0
|
pbr==2.0.0
|
||||||
prettytable==0.7.1
|
prettytable==0.7.1
|
||||||
pycparser==2.18
|
pycparser==2.18
|
||||||
pyflakes==0.8.1
|
|
||||||
pyinotify==0.9.6
|
pyinotify==0.9.6
|
||||||
pyOpenSSL==17.5.0
|
pyOpenSSL==17.5.0
|
||||||
pyparsing==2.2.0
|
pyparsing==2.2.0
|
||||||
|
@ -8,11 +8,10 @@ coverage!=4.4,>=4.0 # Apache-2.0
|
|||||||
ddt>=1.0.1 # MIT
|
ddt>=1.0.1 # MIT
|
||||||
extras>=1.0.0 # MIT
|
extras>=1.0.0 # MIT
|
||||||
graphviz!=0.5.0,>=0.4 # MIT License
|
graphviz!=0.5.0,>=0.4 # MIT License
|
||||||
hacking>=1.1.0,<1.2.0 # Apache-2.0
|
hacking>=3.0,<3.1.0 # Apache-2.0
|
||||||
oslo.log>=3.36.0 # Apache-2.0
|
oslo.log>=3.36.0 # Apache-2.0
|
||||||
oslotest>=3.2.0 # Apache-2.0
|
oslotest>=3.2.0 # Apache-2.0
|
||||||
PrettyTable<0.8,>=0.7.1 # BSD
|
PrettyTable<0.8,>=0.7.1 # BSD
|
||||||
pyflakes>=1.4.0,<1.5
|
|
||||||
PyYAML>=3.10 # MIT
|
PyYAML>=3.10 # MIT
|
||||||
python-barbicanclient>=4.0.0 # Apache-2.0
|
python-barbicanclient>=4.0.0 # Apache-2.0
|
||||||
python-heatclient>=1.10.0 # Apache-2.0
|
python-heatclient>=1.10.0 # Apache-2.0
|
||||||
|
@ -66,6 +66,7 @@ class LoadFromEnv(base.BaseTestCase):
|
|||||||
mock.call().__exit__(None, None, None)],
|
mock.call().__exit__(None, None, None)],
|
||||||
mo.mock_calls)
|
mo.mock_calls)
|
||||||
|
|
||||||
|
|
||||||
FAKE_CONFIG_FILES = [
|
FAKE_CONFIG_FILES = [
|
||||||
set_configs.ConfigFile(
|
set_configs.ConfigFile(
|
||||||
'/var/lib/kolla/config_files/bar.conf',
|
'/var/lib/kolla/config_files/bar.conf',
|
||||||
|
@ -109,5 +109,6 @@ def main():
|
|||||||
)
|
)
|
||||||
return sum([check() for check in checks])
|
return sum([check() for check in checks])
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
sys.exit(main())
|
sys.exit(main())
|
||||||
|
@ -40,5 +40,6 @@ def main():
|
|||||||
|
|
||||||
sys.exit(res)
|
sys.exit(res)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
8
tox.ini
8
tox.ini
@ -192,8 +192,12 @@ show-source = True
|
|||||||
enable-extensions = H203,H106
|
enable-extensions = H203,H106
|
||||||
exclude=.eggs,.git,.tox,doc
|
exclude=.eggs,.git,.tox,doc
|
||||||
|
|
||||||
[hacking]
|
[flake8:local-plugins]
|
||||||
local-check-factory = kolla.hacking.checks.factory
|
extension =
|
||||||
|
D703 = checks:check_explicit_underscore_import
|
||||||
|
K301 = checks:no_mutable_default_args
|
||||||
|
K302 = checks:no_log_warn
|
||||||
|
paths = ./kolla/hacking
|
||||||
|
|
||||||
[testenv:lower-constraints]
|
[testenv:lower-constraints]
|
||||||
deps =
|
deps =
|
||||||
|
Loading…
Reference in New Issue
Block a user