From 161757595a72539ece7e0d743e8c5f6d24749197 Mon Sep 17 00:00:00 2001 From: Troy Dai Date: Sun, 19 Mar 2017 10:40:18 -0700 Subject: [PATCH] Change PEP8 check filter from whitelist to blacklist --- scripts/automation/style/run.py | 12 ++++++------ scripts/automation/utilities/path.py | 10 ++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/scripts/automation/style/run.py b/scripts/automation/style/run.py index 9f02536dc38..8f5bc306e98 100644 --- a/scripts/automation/style/run.py +++ b/scripts/automation/style/run.py @@ -58,7 +58,7 @@ def run_pep8(modules): help='Run pylint') parser.add_argument('--module', dest='modules', action='append', help='The modules on which the style check should run. Accept short names, ' - 'except azure-cli, azure-cli-core and azure-cli-nspkg') + 'except azure-cli, azure-cli-core and azure-cli-nspkg') args = parser.parse_args() if args.ci: @@ -68,11 +68,11 @@ def run_pep8(modules): # Run pylint on all modules return_code_sum = run_pylint(selected_modules) - # Run flake8 on white-listed modules - pep8_ready_modules = automation_path.filter_user_selected_modules( - ['azure-cli', 'azure-cli-core', 'azure-cli-nspkg', 'acs', - 'component', 'cloud', 'feedback', 'profile', 'sql', 'storage', - 'vm']) + # Run flake8 on modules + pep8_ready_modules = automation_path.filter_blacklisted_modules( + ['azure-cli-testsdk', 'acr', 'appservice', 'batch', 'configure', 'container', + 'datalake', 'documentdb', 'find', 'iot', 'keyvault', 'network', 'redis', 'resource', + 'role', 'taskhelp']) return_code_sum += run_pep8(pep8_ready_modules) diff --git a/scripts/automation/utilities/path.py b/scripts/automation/utilities/path.py index ce55f9373de..4c5eb468fbd 100644 --- a/scripts/automation/utilities/path.py +++ b/scripts/automation/utilities/path.py @@ -97,6 +97,16 @@ def get_test_results_dir(with_timestamp=None, prefix=None): return result +def filter_blacklisted_modules(black_list_modules): + """Returns the paths to the modules except those in the black list.""" + import itertools + + existing_modules = list(itertools.chain(get_core_modules_paths(), + get_command_modules_paths())) + black_list_modules = set(black_list_modules) + return list((name, path) for name, path in existing_modules if name not in black_list_modules) + + def filter_user_selected_modules(user_input_modules): import itertools