Skip to content

Commit

Permalink
Merge pull request #387 from lukpueh/adopt-pylint-update
Browse files Browse the repository at this point in the history
Adopt pylint 2.6.0 update
  • Loading branch information
adityasaky committed Aug 27, 2020
2 parents 2f81db5 + 90eb2ff commit 55acb5d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
1 change: 0 additions & 1 deletion in_toto/formats.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"""
import securesystemslib.schema as ssl_schema

# pylint: disable=bad-whitespace
PARAMETER_DICTIONARY_KEY = ssl_schema.RegularExpression(r'[a-zA-Z0-9_-]+')
PARAMETER_DICTIONARY_SCHEMA = ssl_schema.DictOf(
key_schema = PARAMETER_DICTIONARY_KEY,
Expand Down
5 changes: 3 additions & 2 deletions in_toto/runlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- Return Metablock containing a Link object which can be can be signed
and stored to disk
"""
import six
import glob
import logging
import os
Expand Down Expand Up @@ -212,8 +213,8 @@ def record_artifacts_as_dict(artifacts, exclude_patterns=None,
os.chdir(base_path)

except Exception as e:
raise ValueError("Could not use '{}' as base path: '{}'".format(
base_path, e))
six.raise_from(ValueError("Could not use '{}' as base path: '{}'".format(
base_path, e)), e)

# Normalize passed paths
norm_artifacts = []
Expand Down
9 changes: 2 additions & 7 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,12 @@ good-names=e, fn, fp
# TODO: Enable W0703 (broad-except) with in-toto/in-toto#126 and consider
# enabling C0411, C0412, C0413, R0401 (import related checkers) with
# in-toto/in-toto#145.
# TODO: Consider enabling C0330 (bad-continuation) check. This would require
# fixing up hanging indents, to not have parameters in first line (see PEP8).
disable= fixme, logging-format-interpolation, logging-not-lazy, design, broad-except, wrong-import-order, ungrouped-imports, wrong-import-position, cyclic-import, len-as-condition, literal-comparison, useless-object-inheritance, consider-merging-isinstance, duplicate-code, inconsistent-return-statements, bad-continuation, no-self-use, bad-classmethod-argument
disable= fixme, logging-format-interpolation, logging-not-lazy, design, broad-except, wrong-import-order, ungrouped-imports, wrong-import-position, cyclic-import, len-as-condition, literal-comparison, useless-object-inheritance, consider-merging-isinstance, duplicate-code, inconsistent-return-statements, no-self-use, bad-classmethod-argument, super-with-arguments

[VARIABLES]
dummy-variables-rgx= _+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_|junk

[FORMAT]
indent-string=" "
# Number of spaces of indent required inside a hanging or continued line.
# TODO: Un-comment when removing "bad-continuation" from disable list above
#indent-after-paren=4
max-line-length=79
max-module-lines=2000
max-module-lines=2000

0 comments on commit 55acb5d

Please sign in to comment.