From a5d025d8d3792f95b61e9c833b8c140aed4d1dfa Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 28 Oct 2022 16:43:12 +0200 Subject: [PATCH] make linters happy again --- .pylintrc | 11 ++++++++++- .pylinttestsrc | 10 +++++++++- TarSCM/helpers.py | 5 +++-- tests/test.py | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.pylintrc b/.pylintrc index fcedeaab..740cdc01 100644 --- a/.pylintrc +++ b/.pylintrc @@ -84,7 +84,16 @@ confidence= # a feature request to improve pylint in this respect: # https://github.com/PyCQA/pylint/issues/246 -disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,consider-using-with,consider-using-f-string,duplicate-code +# The following disables habe been activated to make most combinations +# of pylint/python versions working again. +# +# * E0012 - bad-option-value +# * R0022 - useless-option-value +# * W0012 - unknown-option-value +# * E0015 - unrecognized-option + + +disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,consider-using-with,consider-using-f-string,duplicate-code,R0022,W0012,E0012,E0015 [REPORTS] diff --git a/.pylinttestsrc b/.pylinttestsrc index 9cb503ac..946686d5 100644 --- a/.pylinttestsrc +++ b/.pylinttestsrc @@ -84,7 +84,15 @@ confidence= # a feature request to improve pylint in this respect: # https://github.com/PyCQA/pylint/issues/246 -disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,duplicate-code,too-many-public-methods,protected-access,too-many-locals,consider-using-with,consider-using-f-string,super-with-arguments +# The following disables habe been activated to make most combinations +# of pylint/python versions working again. +# +# * E0012 - bad-option-value +# * R0022 - useless-option-value +# * W0012 - unknown-option-value +# * E0015 - unrecognized-option + +disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,duplicate-code,too-many-public-methods,protected-access,too-many-locals,consider-using-with,consider-using-f-string,super-with-arguments,E0012,R0022,W0012,E0015 [REPORTS] diff --git a/TarSCM/helpers.py b/TarSCM/helpers.py index 295a052f..0254a97e 100644 --- a/TarSCM/helpers.py +++ b/TarSCM/helpers.py @@ -65,8 +65,9 @@ def run_cmd(self, cmd, cwd, interactive=False, raisesysexit=False): return (proc.returncode, output) def safe_run(self, cmd, cwd, interactive=False): - """Execute the command cmd in the working directory cwd and check return - value. If the command returns non-zero raise a SystemExit exception. + """Execute the command cmd in the working directory cwd and check + return value. If the command returns non-zero raise a SystemExit + exception. """ result = self.run_cmd(cmd, cwd, interactive, raisesysexit=True) return result diff --git a/tests/test.py b/tests/test.py index d5de6c61..191070f9 100755 --- a/tests/test.py +++ b/tests/test.py @@ -70,6 +70,7 @@ def prepare_testsuite(tclasses): to_run = {} for arg in sys.argv[1:]: rmatch = re.match('^/(.+)/$', arg) + # pylint: disable=unnecessary-lambda-assignment if rmatch: # regexp mode regexp = rmatch.group(1)