From a7c6897ba6ef55bf8bc6c31d135b2a3f4d260e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 25 Sep 2019 01:10:22 +0200 Subject: [PATCH] Move pylint configuration into standard location Make it easier to run pylint with correct configuration. This was especially bad as .pylintrc did existed, but was plain default only. --- .pylintrc | 124 ++++++++------------------------ .travis.yml | 2 +- ci/pylintrc | 203 ---------------------------------------------------- 3 files changed, 31 insertions(+), 298 deletions(-) delete mode 100644 ci/pylintrc diff --git a/.pylintrc b/.pylintrc index ddd37c38..88465989 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,115 +1,54 @@ [MASTER] - -# Specify a configuration file. -#rcfile= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Profiled execution. -profile=no - -# Add files or directories to the blacklist. They should be base names, not -# paths. -ignore=CVS - -# Pickle collected data for later comparisons. persistent=no - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -#load-plugins= - +ignore=tests [MESSAGES CONTROL] - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time. -#enable= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). - # abstract-class-little-used: see http://www.logilab.org/ticket/111138 +# deprecated-method: +# enable again after disabling py-3.4.3 asyncio.ensure_future compat hack +# not-an-iterable: +# a lot of false possitives for asyncio (yield from (some coroutine)) disable= + abstract-class-little-used, + bad-continuation, + cyclic-import, + deprecated-method, + duplicate-code, + file-ignored, + fixme, locally-disabled, locally-enabled, - file-ignored, - duplicate-code, + logging-format-interpolation, + missing-docstring, + not-an-iterable, star-args, - cyclic-import, - abstract-class-little-used, - bad-continuation - -# -# OTHER NICE SETS -# - -# IMPORTS -#disable=all -#enable= -# cyclic-import, -# import-error, -# no-member, -# super-on-old-class, -# undefined-variable, -# unused-import - + wrong-import-order [REPORTS] # Set the output format. Available formats are text, parseable, colorized, msvs # (visual studio) and html -output-format=text +output-format=colorized -# Put messages in a separate file for each module / package specified on the -# command line instead of printing them on stdout. Reports (if any) will be -# written in a file name "pylint_global.[txt|html]". -files-output=no - -# Tells whether to display a full report or only the messages +#files-output=no reports=yes -# Python expression which should return a note less than 10 (10 is the highest -# note). You have access to the variables errors warning, statement which -# respectively contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Add a comment according to your evaluation note. This is used by the global -# evaluation report (RP0004). -comment=yes - - [TYPECHECK] +ignored-classes= + VMProperty, + libvirt,libvirtError, + dbus,SystemBus, + PCIDevice -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). ignore-mixin-members=yes - -# List of classes names for which member attributes should not be checked -# (useful for classes with attributes dynamically set). -#ignored-classes= - -# When zope mode is activated, add a predefined set of Zope acquired attributes -# to generated-members. -zope=no - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E0201 when accessed. Python regular -# expressions are accepted. -#generated-members= - +generated-members= + iter_entry_points, + Element,ElementTree,QName,SubElement,fromstring,parse,tostring, [BASIC] # List of builtins function names that should not be used, separated by a comma -bad-functions=map,filter,apply,input +bad-functions=apply,input # Regular expression which should only match correct module names module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ @@ -140,7 +79,7 @@ variable-rgx=[a-z_][a-z0-9_]{2,30}$ inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ # Good variable names which should always be accepted, separated by a comma -good-names=e,i,j,k,m,p,ex,Run,_,log,vm,xc,xs,ip,fd,fh,rw,st,tb +good-names=e,i,j,k,m,p,v,ex,Run,_,log,vm,xc,xs,ip,fd,fh,rw,st,tb,cb,ff # Bad variable names which should always be refused, separated by a comma bad-names=foo,bar,baz,toto,tutu,tata @@ -178,10 +117,6 @@ init-import=no # (i.e. not used). dummy-variables-rgx=_|dummy -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -#additional-builtins= - [SIMILARITIES] @@ -207,7 +142,7 @@ valid-classmethod-first-arg=cls [IMPORTS] # Deprecated modules which should not be used, separated by a comma -deprecated-modules=regsub,string,TERMIOS,Bastion,rexec +deprecated-modules=regsub,TERMIOS,Bastion,rexec # Create a graph of every (i.e. internal and external) dependencies in the # given file (report RP0402 must not be disabled) @@ -265,3 +200,4 @@ max-public-methods=100 # "Exception" overgeneral-exceptions=Exception,EnvironmentError +# vim: ft=conf diff --git a/.travis.yml b/.travis.yml index cfb99cd8..de8c1f05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ install: - pip install --quiet -r ci/requirements.txt - git clone https://github.com/"${TRAVIS_REPO_SLUG%%/*}"/qubes-builder ~/qubes-builder script: - - PYTHONPATH=test-packages pylint --rcfile=ci/pylintrc qubes + - PYTHONPATH=test-packages pylint qubes - ./run-tests --no-syslog - ~/qubes-builder/scripts/travis-build env: diff --git a/ci/pylintrc b/ci/pylintrc deleted file mode 100644 index 88465989..00000000 --- a/ci/pylintrc +++ /dev/null @@ -1,203 +0,0 @@ -[MASTER] -persistent=no -ignore=tests - -[MESSAGES CONTROL] -# abstract-class-little-used: see http://www.logilab.org/ticket/111138 -# deprecated-method: -# enable again after disabling py-3.4.3 asyncio.ensure_future compat hack -# not-an-iterable: -# a lot of false possitives for asyncio (yield from (some coroutine)) -disable= - abstract-class-little-used, - bad-continuation, - cyclic-import, - deprecated-method, - duplicate-code, - file-ignored, - fixme, - locally-disabled, - locally-enabled, - logging-format-interpolation, - missing-docstring, - not-an-iterable, - star-args, - wrong-import-order - -[REPORTS] - -# Set the output format. Available formats are text, parseable, colorized, msvs -# (visual studio) and html -output-format=colorized - -#files-output=no -reports=yes - -[TYPECHECK] -ignored-classes= - VMProperty, - libvirt,libvirtError, - dbus,SystemBus, - PCIDevice - -ignore-mixin-members=yes -generated-members= - iter_entry_points, - Element,ElementTree,QName,SubElement,fromstring,parse,tostring, - -[BASIC] - -# List of builtins function names that should not be used, separated by a comma -bad-functions=apply,input - -# Regular expression which should only match correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Regular expression which should only match correct module level names -const-rgx=(([A-Za-z_][A-Za-z0-9_]*)|(__.*__))$ - -# Regular expression which should only match correct class names -class-rgx=([A-Z_][a-zA-Z0-9]+|TC_\d\d_[a-zA-Z0-9_]+)$ - -# Regular expression which should only match correct function names -function-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct method names -method-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct instance attribute names -attr-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct argument names -argument-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct variable names -variable-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct list comprehension / -# generator expression variable names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Good variable names which should always be accepted, separated by a comma -good-names=e,i,j,k,m,p,v,ex,Run,_,log,vm,xc,xs,ip,fd,fh,rw,st,tb,cb,ff - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata - -# Regular expression which should only match functions or classes name which do -# not require a docstring -no-docstring-rgx=__.*__ - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -notes=FIXME,FIX,XXX,TODO - - -[FORMAT] - -# Maximum number of characters on a single line. -max-line-length=80 - -# Maximum number of lines in a module -max-module-lines=3000 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - - -[VARIABLES] - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# A regular expression matching the beginning of the name of dummy variables -# (i.e. not used). -dummy-variables-rgx=_|dummy - - -[SIMILARITIES] - -# Minimum lines number of a similarity. -min-similarity-lines=4 - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - - -[CLASSES] - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - - -[IMPORTS] - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=regsub,TERMIOS,Bastion,rexec - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= - - -[DESIGN] - -# Maximum number of arguments for function / method -max-args=35 - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=_.* - -# Maximum number of locals for function / method body -# Let's have max-args + 5 -max-locals=40 - -# Maximum number of return / yield for function / method body -max-returns=6 - -# Maximum number of branch for function / method body -# 4x the default value -max-branches=48 - -# Maximum number of statements in function / method body -# Double default -max-statements=100 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of attributes for a class (see R0902). -max-attributes=15 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=2 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=100 - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=Exception,EnvironmentError - -# vim: ft=conf