diff --git a/pavelib/quality.py b/pavelib/quality.py index 7ad4d76316..37ad467704 100644 --- a/pavelib/quality.py +++ b/pavelib/quality.py @@ -195,14 +195,12 @@ def run_quality(options): sh( "{pythonpath_prefix} diff-quality --violations=pylint " "{pylint_reports} {percentage_string} {compare_branch_string} " - "--html-report {dquality_dir}/diff_quality_pylint.html " - "--options='{pylint_options}'".format( + "--html-report {dquality_dir}/diff_quality_pylint.html ".format( pythonpath_prefix=pythonpath_prefix, pylint_reports=pylint_reports, percentage_string=percentage_string, compare_branch_string=compare_branch_string, dquality_dir=dquality_dir, - pylint_options="--disable=fixme", ) ) except BuildFailure, error_message: diff --git a/pylintrc b/pylintrc index e0efdef419..aa77522d5b 100644 --- a/pylintrc +++ b/pylintrc @@ -47,6 +47,9 @@ disable= # W0232: Class has no __init__ method W0232, +# Disable 'fixme' so that quality builds don't fail due to them + W0511, + # Might use these when the code is in better shape # C0302: Too many lines in module # R0201: Method could be a function