diff --git a/.pylintrc b/.pylintrc index cecfeab..b9c26ef 100644 --- a/.pylintrc +++ b/.pylintrc @@ -7,9 +7,6 @@ # pygtk.require(). #init-hook= -# Profiled execution. -profile=no - # Add files or directories to the blacklist. They should be base names, not # paths. ignore=CVS @@ -21,13 +18,6 @@ persistent=no # usually to register additional checkers. load-plugins= -# DEPRECATED -include-ids=no - -# DEPRECATED -symbols=no - - [MESSAGES CONTROL] # Enable the message, report, category or checker with the given id(s). You can @@ -53,11 +43,6 @@ disable=W,C,R,no-member,assignment-from-no-return,assignment-from-none # mypackage.mymodule.MyReporterClass. output-format=text -# 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 reports=no @@ -68,10 +53,6 @@ reports=no # (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=no - # Template used to display messages. This is a python new-style format string # used to format the message information. See doc for all details #msg-template= @@ -107,10 +88,6 @@ ignored-modules=distutils # (useful for classes with attributes dynamically set). ignored-classes=SQLObject -# 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. @@ -125,12 +102,6 @@ notes=FIXME,XXX,TODO [BASIC] -# Required attributes for module, separated by a comma -required-attributes= - -# List of builtins function names that should not be used, separated by a comma -bad-functions=map,filter,apply,input,file - # Good variable names which should always be accepted, separated by a comma good-names=i,j,k,ex,Run,_ @@ -147,63 +118,33 @@ include-naming-hint=no # Regular expression matching correct function names function-rgx=[a-z_][a-z0-9_]{2,30}$ -# Naming hint for function names -function-name-hint=[a-z_][a-z0-9_]{2,30}$ - # Regular expression matching correct variable names variable-rgx=[a-z_][a-z0-9_]{2,30}$ -# Naming hint for variable names -variable-name-hint=[a-z_][a-z0-9_]{2,30}$ - # Regular expression matching correct constant names const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ -# Naming hint for constant names -const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - # Regular expression matching correct attribute names attr-rgx=[a-z_][a-z0-9_]{2,30}$ -# Naming hint for attribute names -attr-name-hint=[a-z_][a-z0-9_]{2,30}$ - # Regular expression matching correct argument names argument-rgx=[a-z_][a-z0-9_]{2,30}$ -# Naming hint for argument names -argument-name-hint=[a-z_][a-z0-9_]{2,30}$ - # Regular expression matching correct class attribute names class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ -# Naming hint for class attribute names -class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - # Regular expression matching correct inline iteration names inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ -# Naming hint for inline iteration names -inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$ - # Regular expression matching correct class names class-rgx=[A-Z_][a-zA-Z0-9]+$ -# Naming hint for class names -class-name-hint=[A-Z_][a-zA-Z0-9]+$ - # Regular expression matching correct module names module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ -# Naming hint for module names -module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - # Regular expression matching correct method names method-rgx=[a-z_][a-z0-9_]{2,30}$ -# Naming hint for method names -method-name-hint=[a-z_][a-z0-9_]{2,30}$ - # Regular expression which should only match function or class names that do # not require a docstring. no-docstring-rgx=__.*__ @@ -246,9 +187,6 @@ ignore-long-lines=^\s*(# )??$ # else. single-line-if-stmt=no -# List of optional constructs for which whitespace checking is disabled -no-space-check=trailing-comma,dict-separator - # Maximum number of lines in a module max-module-lines=1000 @@ -293,10 +231,6 @@ max-public-methods=20 [CLASSES] -# List of interface methods to ignore, separated by a comma. This is used for -# instance to not check methods defines in Zope's Interface base class. -ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by - # List of method names used to declare (i.e. assign) instance attributes. defining-attr-methods=__init__,__new__,setUp @@ -329,4 +263,4 @@ int-import-graph= # Exceptions that will emit a warning when being caught. Defaults to # "Exception" -overgeneral-exceptions=Exception +overgeneral-exceptions=builtins.Exception diff --git a/.zuul.yaml b/.zuul.yaml index 9441bd1..49ba24b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,8 +1,9 @@ - project: + queue: freezer templates: - check-requirements - - openstack-python3-zed-jobs - - openstack-python3-zed-jobs-arm64 + - openstack-python3-jobs + - openstack-python3-jobs-arm64 - publish-openstack-docs-pti - release-notes-jobs-python3 check: diff --git a/bindep.txt b/bindep.txt index 4a1add2..5c78feb 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,13 +1,11 @@ # A build time dependency # these are needed to compile Python dependencies from sources -python-dev [platform:dpkg test] python3-all-dev [platform:dpkg !platform:ubuntu-precise test] -python-devel [platform:rpm test] python3-devel [platform:rpm test] build-essential [platform:dpkg test] # these are needed by infra for python-* jobs +libmariadb-dev-compat [platform:dpkg test] mariadb [platform:rpm test] -mariadb-server [platform:rpm test] -mysql-client [platform:dpkg test] -mysql-server [platform:dpkg test] - +mariadb-client [platform:dpkg test] +mariadb-devel [platform:rpm test] +mariadb-server [test] diff --git a/noop b/noop new file mode 100644 index 0000000..e69de29 diff --git a/test-requirements.txt b/test-requirements.txt index 0c6130b..c3f99dc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,6 +8,4 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0 coverage>=4.5.1 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT -astroid==2.1.0 # LGPLv2.1 -isort==4.3.21 #MIT -pylint==2.2.0 # GPLv2 +pylint>=2.6.0 # GPLv2 diff --git a/tox.ini b/tox.ini index e77dfdd..0c6486f 100644 --- a/tox.ini +++ b/tox.ini @@ -27,7 +27,7 @@ commands = rm -f .coverage rm -rf .testrepository -whitelist_externals = +allowlist_externals = find coverage rm @@ -38,12 +38,12 @@ norecursedirs = .tox .venv [testenv:venv] commands = {posargs} -[testenv:py38] -basepython = python3.8 - [testenv:py39] basepython = python3.9 +[testenv:py312] +basepython = python3.12 + [testenv:docs] deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -b html doc/source doc/build/html