mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-29 17:39:48 +03:00
Added black configuration
This commit is contained in:
parent
0407a0df8a
commit
8b0d13dc0c
|
@ -5,3 +5,6 @@ pycodestyle==2.3.1
|
||||||
|
|
||||||
# Sort and lint imports
|
# Sort and lint imports
|
||||||
isort==4.3.3
|
isort==4.3.3
|
||||||
|
|
||||||
|
# black
|
||||||
|
black==19.3b0
|
||||||
|
|
17
runtests.py
17
runtests.py
|
@ -13,6 +13,7 @@ FLAKE8_ARGS = ['rest_framework', 'tests']
|
||||||
|
|
||||||
ISORT_ARGS = ['--recursive', '--check-only', '--diff', '-o' 'uritemplate', '-p', 'tests', 'rest_framework', 'tests']
|
ISORT_ARGS = ['--recursive', '--check-only', '--diff', '-o' 'uritemplate', '-p', 'tests', 'rest_framework', 'tests']
|
||||||
|
|
||||||
|
BLACK_ARGS = ['--check', '--verbose']
|
||||||
|
|
||||||
def exit_on_failure(ret, message=None):
|
def exit_on_failure(ret, message=None):
|
||||||
if ret:
|
if ret:
|
||||||
|
@ -37,6 +38,16 @@ def isort_main(args):
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
def black_main(args):
|
||||||
|
print('Running black code checking')
|
||||||
|
ret = subprocess.call(['black', '.'] + args)
|
||||||
|
|
||||||
|
if ret:
|
||||||
|
print('black failed: Some code have incorrectly formatted. Fix by running `black .`')
|
||||||
|
else:
|
||||||
|
print('black passed')
|
||||||
|
return ret
|
||||||
|
|
||||||
|
|
||||||
def split_class_and_function(string):
|
def split_class_and_function(string):
|
||||||
class_string, function_string = string.split('.', 1)
|
class_string, function_string = string.split('.', 1)
|
||||||
|
@ -57,9 +68,11 @@ if __name__ == "__main__":
|
||||||
try:
|
try:
|
||||||
sys.argv.remove('--nolint')
|
sys.argv.remove('--nolint')
|
||||||
except ValueError:
|
except ValueError:
|
||||||
|
run_black = True
|
||||||
run_flake8 = True
|
run_flake8 = True
|
||||||
run_isort = True
|
run_isort = True
|
||||||
else:
|
else:
|
||||||
|
run_black = False
|
||||||
run_flake8 = False
|
run_flake8 = False
|
||||||
run_isort = False
|
run_isort = False
|
||||||
|
|
||||||
|
@ -76,6 +89,7 @@ if __name__ == "__main__":
|
||||||
style = 'default'
|
style = 'default'
|
||||||
else:
|
else:
|
||||||
style = 'fast'
|
style = 'fast'
|
||||||
|
run_black = False
|
||||||
run_flake8 = False
|
run_flake8 = False
|
||||||
run_isort = False
|
run_isort = False
|
||||||
|
|
||||||
|
@ -115,3 +129,6 @@ if __name__ == "__main__":
|
||||||
|
|
||||||
if run_isort:
|
if run_isort:
|
||||||
exit_on_failure(isort_main(ISORT_ARGS))
|
exit_on_failure(isort_main(ISORT_ARGS))
|
||||||
|
|
||||||
|
if run_black:
|
||||||
|
exit_on_failure(black_main(BLACK_ARGS))
|
Loading…
Reference in New Issue
Block a user