pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-15 00:44:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge Florent's multiprocessing work over Joe's

Browse source
This commit is contained in:
Ian Cordasco 2014-06-27 07:57:45 -05:00
commit a0e3f364b1
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake8/engine.py
View file

@ -55,8 +55,9 @@ def get_parser():
except NotImplementedError: except NotImplementedError:
auto = 1 auto = 1
parser.config_options.append('jobs') parser.config_options.append('jobs')
parser.add_option('-j', '--jobs', type='int', default=auto, parser.add_option('-j', '--jobs', type='string', default='',
help="number of jobs to run simultaneously") help="number of jobs to run simultaneously, "
"or 'auto'")
parser.add_option('--exit-zero', action='store_true', parser.add_option('--exit-zero', action='store_true',
help="exit with code 0 even if there are errors") help="exit with code 0 even if there are errors")
@ -91,11 +92,20 @@ def get_style_guide(**kwargs):
for options_hook in options_hooks: for options_hook in options_hooks:
options_hook(options) options_hook(options)
if multiprocessing and options.jobs > 1: if multiprocessing and options.jobs:
reporter = BaseQReport if options.quiet else QueueReport if options.jobs.isdigit():
report = styleguide.init_report(reporter) n_jobs = int(options.jobs)
report.input_file = styleguide.input_file else:
styleguide.runner = report.task_queue.put try:
n_jobs = multiprocessing.cpu_count()
except NotImplementedError:
n_jobs = 1
if n_jobs > 1:
options.jobs = n_jobs
reporter = BaseQReport if options.quiet else QueueReport
report = styleguide.init_report(reporter)
report.input_file = styleguide.input_file
styleguide.runner = report.task_queue.put
return styleguide return styleguide

2
flake8/tests/test_engine.py
View file

@ -34,7 +34,7 @@ class TestEngine(unittest.TestCase):
m = mock.Mock() m = mock.Mock()
with mock.patch('flake8.engine.StyleGuide') as StyleGuide: with mock.patch('flake8.engine.StyleGuide') as StyleGuide:
with mock.patch('flake8.engine.get_parser') as get_parser: with mock.patch('flake8.engine.get_parser') as get_parser:
StyleGuide.return_value.options.jobs = 42 StyleGuide.return_value.options.jobs = '42'
get_parser.return_value = (m, []) get_parser.return_value = (m, [])
engine.get_style_guide(foo='bar') engine.get_style_guide(foo='bar')
get_parser.assert_called_once_with() get_parser.assert_called_once_with()