add pylint integration & fix some pylint warnings

.pylintrc

@@ -0,0 +1,608 @@
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code.
+extension-pkg-whitelist=
+
+# Specify a score threshold to be exceeded before program exits with error.
+fail-under=10.0
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the blacklist. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
+jobs=1
+
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# List of plugins (as comma separated values of python module names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages.
+suggestion-mode=yes
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once). You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=print-statement,
+        parameter-unpacking,
+        unpacking-in-except,
+        old-raise-syntax,
+        backtick,
+        long-suffix,
+        old-ne-operator,
+        old-octal-literal,
+        import-star-module-level,
+        non-ascii-bytes-literal,
+        raw-checker-failed,
+        bad-inline-option,
+        locally-disabled,
+        file-ignored,
+        suppressed-message,
+        useless-suppression,
+        deprecated-pragma,
+        use-symbolic-message-instead,
+        apply-builtin,
+        basestring-builtin,
+        buffer-builtin,
+        cmp-builtin,
+        coerce-builtin,
+        execfile-builtin,
+        file-builtin,
+        long-builtin,
+        raw_input-builtin,
+        reduce-builtin,
+        standarderror-builtin,
+        unicode-builtin,
+        xrange-builtin,
+        coerce-method,
+        delslice-method,
+        getslice-method,
+        setslice-method,
+        no-absolute-import,
+        old-division,
+        dict-iter-method,
+        dict-view-method,
+        next-method-called,
+        metaclass-assignment,
+        indexing-exception,
+        raising-string,
+        reload-builtin,
+        oct-method,
+        hex-method,
+        nonzero-method,
+        cmp-method,
+        input-builtin,
+        round-builtin,
+        intern-builtin,
+        unichr-builtin,
+        map-builtin-not-iterating,
+        zip-builtin-not-iterating,
+        range-builtin-not-iterating,
+        filter-builtin-not-iterating,
+        using-cmp-argument,
+        eq-without-hash,
+        div-method,
+        idiv-method,
+        rdiv-method,
+        exception-message-attribute,
+        invalid-str-codec,
+        sys-max-int,
+        bad-python3-import,
+        deprecated-string-function,
+        deprecated-str-translate-call,
+        deprecated-itertools-function,
+        deprecated-types-field,
+        next-method-defined,
+        dict-items-not-iterating,
+        dict-keys-not-iterating,
+        dict-values-not-iterating,
+        deprecated-operator-function,
+        deprecated-urllib-function,
+        xreadlines-attribute,
+        deprecated-sys-function,
+        exception-escape,
+        comprehension-escape,
+        missing-module-docstring,
+        line-too-long,
+        no-name-in-module,
+        import-outside-toplevel,
+        invalid-name,
+        raise-missing-from,
+        wrong-import-order,
+        too-few-public-methods,
+        too-many-instance-attributes,
+        broad-except,
+        logging-fstring-interpolation,
+        too-many-ancestors,
+        fixme,
+        too-many-arguments,
+        duplicate-code,
+        cyclic-import
+
+
+# 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 (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
+
+
+[REPORTS]
+
+# Python expression which should return a score less than or equal to 10. You
+# have access to the variables 'error', 'warning', 'refactor', and 'convention'
+# which contain the number of messages in each category, as well as 'statement'
+# which is the total number of statements analyzed. This score is used by the
+# global evaluation report (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# 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=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages.
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module.
+max-module-lines=1000
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[BASIC]
+
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
+
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style.
+#argument-rgx=
+
+# Naming style matching correct attribute names.
+attr-naming-style=snake_case
+
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style.
+#attr-rgx=
+
+# Bad variable names which should always be refused, separated by a comma.
+bad-names=foo,
+          bar,
+          baz,
+          toto,
+          tutu,
+          tata
+
+# Bad variable names regexes, separated by a comma. If names match any regex,
+# they will always be refused
+bad-names-rgxs=
+
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style.
+#class-attribute-rgx=
+
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
+# Regular expression matching correct class names. Overrides class-naming-
+# style.
+#class-rgx=
+
+# Naming style matching correct constant names.
+const-naming-style=UPPER_CASE
+
+# Regular expression matching correct constant names. Overrides const-naming-
+# style.
+#const-rgx=
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming style matching correct function names.
+function-naming-style=snake_case
+
+# Regular expression matching correct function names. Overrides function-
+# naming-style.
+#function-rgx=
+
+# Good variable names which should always be accepted, separated by a comma.
+good-names=i,
+           j,
+           k,
+           ex,
+           Run,
+           _
+
+# Good variable names regexes, separated by a comma. If names match any regex,
+# they will always be accepted
+good-names-rgxs=
+
+# Include a hint for the correct naming format with invalid-name.
+include-naming-hint=no
+
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style.
+#inlinevar-rgx=
+
+# Naming style matching correct method names.
+method-naming-style=snake_case
+
+# Regular expression matching correct method names. Overrides method-naming-
+# style.
+#method-rgx=
+
+# Naming style matching correct module names.
+module-naming-style=snake_case
+
+# Regular expression matching correct module names. Overrides module-naming-
+# style.
+#module-rgx=
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+# These decorators are taken in consideration only for invalid-name.
+property-classes=abc.abstractproperty
+
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
+
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style.
+#variable-rgx=
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# 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
+
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis). It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+# List of decorators that change the signature of a decorated function.
+signature-mutators=
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[LOGGING]
+
+# The type of string formatting that logging methods do. `old` means using %
+# formatting, `new` is for `{}` formatting.
+logging-format-style=old
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+      XXX,
+      TODO
+
+# Regular expression of note tags to take in consideration.
+#notes-rgx=
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
+# Spelling dictionary name. Available dictionaries: none. To make it work,
+# install the python-enchant package.
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains the private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to the private dictionary (see the
+# --spelling-private-dict-file option) instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+          _cb
+
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore.
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+
+
+[STRING]
+
+# This flag controls whether inconsistent-quotes generates a warning when the
+# character used as a quote delimiter is used inconsistently within a module.
+check-quote-consistency=no
+
+# This flag controls whether the implicit-str-concat should generate a warning
+# on implicit string concatenation in sequences defined over several lines.
+check-str-concat-over-line-jumps=no
+
+
+[IMPORTS]
+
+# List of modules that can be imported at any level, not just the top level
+# one.
+allow-any-import-level=
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=optparse,tkinter.tix
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled).
+ext-import-graph=
+
+# 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 internal dependencies in the given file (report RP0402 must
+# not be disabled).
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+# Couples of modules and preferred modules, separated by a comma.
+preferred-modules=
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method.
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in an if statement (see R0916).
+max-bool-expr=5
+
+# Maximum number of branch for function / method body.
+max-branches=12
+
+# Maximum number of locals for function / method body.
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body.
+max-returns=6
+
+# Maximum number of statements in function / method body.
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[CLASSES]
+
+# Warn about protected attribute access inside special methods
+check-protected-access-in-special-methods=no
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+                      __new__,
+                      setUp,
+                      __post_init__
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,
+                  _fields,
+                  _replace,
+                  _source,
+                  _make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=cls
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "BaseException, Exception".
+overgeneral-exceptions=BaseException,
+                       Exception

Makefile

@@ -27,6 +27,7 @@ archlinux: archive
 check:
 	cd src && mypy --strict -p $(PROJECT)
 	cd src && find $(PROJECT) -name '*.py' -execdir autopep8 --max-line-length 120 -aa -i {} +
+	cd src && pylint --rcfile=../.pylintrc $(PROJECT)
 
 clean:
 	find . -type f -name '$(PROJECT)-*-src.tar.xz' -delete

src/ahriman/application/ahriman.py

@@ -39,7 +39,7 @@ def _call(args: argparse.Namespace, architecture: str, config: Configuration) ->
     :return: True on success, False otherwise
     '''
     try:
-        with Lock(args.lock, architecture, args.force, args.unsafe, config):
+        with Lock(args.lock, architecture, config):
             args.fn(args, architecture, config)
         return True
     except Exception:
@@ -75,8 +75,9 @@ def dump_config(args: argparse.Namespace, architecture: str, config: Configurati
     :param architecture: repository architecture
     :param config: configuration instance
     '''
-    result = config.dump(architecture)
-    for section, values in sorted(result.items()):
+    del args
+    config_dump = config.dump(architecture)
+    for section, values in sorted(config_dump.items()):
         print(f'[{section}]')
         for key, value in sorted(values.items()):
             print(f'{key} = {value}')
@@ -90,6 +91,7 @@ def rebuild(args: argparse.Namespace, architecture: str, config: Configuration)
     :param architecture: repository architecture
     :param config: configuration instance
     '''
+    del args
     app = Application(architecture, config)
     packages = app.repository.packages()
     app.update(packages)
@@ -151,6 +153,7 @@ def web(args: argparse.Namespace, architecture: str, config: Configuration) -> N
     :param architecture: repository architecture
     :param config: configuration instance
     '''
+    del args
     from ahriman.web.web import run_server, setup_service
     application = setup_service(architecture, config)
     run_server(application, architecture)
@@ -221,13 +224,14 @@ if __name__ == '__main__':
     web_parser = subparsers.add_parser('web', description='start web server')
     web_parser.set_defaults(fn=web, lock=None)
 
-    args = parser.parse_args()
-    if 'fn' not in args:
+    cmd_args = parser.parse_args()
+    if 'fn' not in cmd_args:
         parser.print_help()
-        exit(1)
+        sys.exit(1)
 
-    config = Configuration.from_path(args.config)
-    with Pool(len(args.architecture)) as pool:
-        result = pool.starmap(_call, [(args, architecture, config) for architecture in args.architecture])
+    configuration = Configuration.from_path(cmd_args.config)
+    with Pool(len(cmd_args.architecture)) as pool:
+        result = pool.starmap(
+            _call, [(cmd_args, architecture, configuration) for architecture in cmd_args.architecture])
 
     sys.exit(0 if all(result) else 1)

src/ahriman/application/application.py

@@ -136,15 +136,15 @@ class Application:
         :param no_packages: do not clear directory with built packages
         '''
         if not no_build:
-            self.repository._clear_build()
+            self.repository.clear_build()
         if not no_cache:
-            self.repository._clear_cache()
+            self.repository.clear_cache()
         if not no_chroot:
-            self.repository._clear_chroot()
+            self.repository.clear_chroot()
         if not no_manual:
-            self.repository._clear_manual()
+            self.repository.clear_manual()
         if not no_packages:
-            self.repository._clear_packages()
+            self.repository.clear_packages()
 
     def remove(self, names: Iterable[str]) -> None:
         '''

src/ahriman/application/lock.py

@@ -19,6 +19,7 @@
 #
 from __future__ import annotations
 
+import argparse
 import os
 
 from types import TracebackType
@@ -40,19 +41,16 @@ class Lock:
     :ivar unsafe: skip user check
     '''
 
-    def __init__(self, path: Optional[str], architecture: str, force: bool, unsafe: bool,
-                 config: Configuration) -> None:
+    def __init__(self, args: argparse.Namespace, architecture: str, config: Configuration) -> None:
         '''
         default constructor
-        :param path: optional path to lock file, if empty no file lock will be used
+        :param args: command line args
         :param architecture: repository architecture
-        :param force: remove lock file on start if any
-        :param unsafe: skip user check
         :param config: configuration instance
         '''
-        self.path = f'{path}_{architecture}' if path is not None else None
-        self.force = force
-        self.unsafe = unsafe
+        self.path = f'{args.lock}_{architecture}' if args.lock is not None else None
+        self.force = args.force
+        self.unsafe = args.unsafe
 
         self.root = config.get('repository', 'root')
         self.reporter = Client.load(architecture, config)

src/ahriman/core/report/report.py

@@ -72,4 +72,3 @@ class Report:
         generate report for the specified packages
         :param packages: list of packages to generate report
         '''
-        pass

src/ahriman/core/repository.py

@@ -72,35 +72,35 @@ class Repository:
         self.repo = Repo(self.name, self.paths, self.sign.repository_sign_args)
         self.reporter = Client.load(architecture, config)
 
-    def _clear_build(self) -> None:
+    def clear_build(self) -> None:
         '''
         clear sources directory
         '''
         for package in os.listdir(self.paths.sources):
             shutil.rmtree(os.path.join(self.paths.sources, package))
 
-    def _clear_cache(self) -> None:
+    def clear_cache(self) -> None:
         '''
         clear cache directory
         '''
         for package in os.listdir(self.paths.cache):
             shutil.rmtree(os.path.join(self.paths.cache, package))
 
-    def _clear_chroot(self) -> None:
+    def clear_chroot(self) -> None:
         '''
         clear cache directory. Warning: this method is architecture independent and will clear every chroot
         '''
         for chroot in os.listdir(self.paths.chroot):
             shutil.rmtree(os.path.join(self.paths.chroot, chroot))
 
-    def _clear_manual(self) -> None:
+    def clear_manual(self) -> None:
         '''
         clear directory with manual package updates
         '''
         for package in os.listdir(self.paths.manual):
             shutil.rmtree(os.path.join(self.paths.manual, package))
 
-    def _clear_packages(self) -> None:
+    def clear_packages(self) -> None:
         '''
         clear directory with built packages (NOT repository itself)
         '''
@@ -157,7 +157,7 @@ class Repository:
                 self.reporter.set_failed(package.base)
                 self.logger.exception(f'{package.base} ({self.architecture}) build exception', exc_info=True)
                 continue
-        self._clear_build()
+        self.clear_build()
 
         return self.packages_built()
 
@@ -226,7 +226,7 @@ class Repository:
             except Exception:
                 self.reporter.set_failed(local.base)
                 self.logger.exception(f'could not process {package}', exc_info=True)
-        self._clear_packages()
+        self.clear_packages()
 
         return self.repo.repo_path
 
@@ -280,6 +280,6 @@ class Repository:
                     self.reporter.set_pending(local.base)
             except Exception:
                 self.logger.exception(f'could not add package from {fn}', exc_info=True)
-        self._clear_manual()
+        self.clear_manual()
 
         return result

src/ahriman/core/sign/gpg.py

@@ -59,6 +59,16 @@ class GPG:
             return []
         return ['--sign', '--key', self.default_key]
 
+    @staticmethod
+    def sign_cmd(path: str, key: str) -> List[str]:
+        '''
+        gpg command to run
+        :param path: path to file to sign
+        :param key: PGP key ID
+        :return: gpg command with all required arguments
+        '''
+        return ['gpg', '-u', key, '-b', path]
+
     def process(self, path: str, key: str) -> List[str]:
         '''
         gpg command wrapper
@@ -67,21 +77,12 @@ class GPG:
         :return: list of generated files including original file
         '''
         check_output(
-            *self.sign_cmd(path, key),
+            *GPG.sign_cmd(path, key),
             exception=BuildFailed(path),
             cwd=os.path.dirname(path),
             logger=self.logger)
         return [path, f'{path}.sig']
 
-    def sign_cmd(self, path: str, key: str) -> List[str]:
-        '''
-        gpg command to run
-        :param path: path to file to sign
-        :param key: PGP key ID
-        :return: gpg command with all required arguments
-        '''
-        return ['gpg', '-u', key, '-b', path]
-
     def sign_package(self, path: str, base: str) -> List[str]:
         '''
         sign package if required by configuration

src/ahriman/core/tree.py

@@ -92,7 +92,7 @@ class Tree:
         '''
         result: List[List[Package]] = []
 
-        unprocessed = [leaf for leaf in self.leaves]
+        unprocessed = self.leaves[:]
         while unprocessed:
             result.append([leaf.package for leaf in unprocessed if leaf.is_root(unprocessed)])
             unprocessed = [leaf for leaf in unprocessed if not leaf.is_root(unprocessed)]

src/ahriman/core/upload/uploader.py

@@ -72,4 +72,3 @@ class Uploader:
         sync data to remote server
         :param path: local path to sync
         '''
-        pass

src/ahriman/core/util.py

@@ -79,16 +79,16 @@ def pretty_size(size: Optional[float], level: int = 0) -> str:
     def str_level() -> str:
         if level == 0:
             return 'B'
-        elif level == 1:
+        if level == 1:
             return 'KiB'
-        elif level == 2:
+        if level == 2:
             return 'MiB'
-        elif level == 3:
+        if level == 3:
             return 'GiB'
         raise InvalidOption(level)  # I hope it will not be more than 1024 GiB
 
     if size is None:
         return ''
-    elif size < 1024:
+    if size < 1024:
         return f'{round(size, 2)} {str_level()}'
     return pretty_size(size / 1024, level + 1)

src/ahriman/core/watcher/client.py

@@ -35,14 +35,12 @@ class Client:
         :param package: package properties
         :param status: current package build status
         '''
-        pass
 
     def remove(self, base: str) -> None:
         '''
         remove packages from watcher
         :param base: basename to remove
         '''
-        pass
 
     def update(self, base: str, status: BuildStatusEnum) -> None:
         '''
@@ -50,14 +48,12 @@ class Client:
         :param base: package base to update
         :param status: current package build status
         '''
-        pass
 
     def update_self(self, status: BuildStatusEnum) -> None:
         '''
         update ahriman status itself
         :param status: current ahriman status
         '''
-        pass
 
     def set_building(self, base: str) -> None:
         '''

src/ahriman/core/watcher/watcher.py

@@ -50,7 +50,7 @@ class Watcher:
         '''
         :return: list of packages together with their statuses
         '''
-        return [pair for pair in self.known.values()]
+        return list(self.known.values())
 
     def get(self, base: str) -> Tuple[Package, BuildStatus]:
         '''

src/ahriman/core/watcher/web_client.py

@@ -113,4 +113,4 @@ class WebClient(Client):
             response = requests.post(self._ahriman_url(), json=payload)
             response.raise_for_status()
         except Exception:
-            self.logger.exception(f'could not update service status', exc_info=True)
+            self.logger.exception('could not update service status', exc_info=True)

src/ahriman/models/build_status.py

@@ -46,11 +46,11 @@ class BuildStatusEnum(Enum):
         '''
         if self == BuildStatusEnum.Pending:
             return 'yellow'
-        elif self == BuildStatusEnum.Building:
+        if self == BuildStatusEnum.Building:
             return 'yellow'
-        elif self == BuildStatusEnum.Failed:
+        if self == BuildStatusEnum.Failed:
             return 'critical'
-        elif self == BuildStatusEnum.Success:
+        if self == BuildStatusEnum.Success:
             return 'success'
         return 'inactive'
 

src/ahriman/models/package.py

@@ -19,9 +19,8 @@
 #
 from __future__ import annotations
 
-import logging
-
 import aur  # type: ignore
+import logging
 import os
 
 from dataclasses import dataclass
@@ -95,12 +94,12 @@ class Package:
         # update pkgver first
         check_output('makepkg', '--nodeps', '--nobuild', exception=None, cwd=clone_dir, logger=logger)
         # generate new .SRCINFO and put it to parser
-        src_info_source = check_output('makepkg', '--printsrcinfo', exception=None, cwd=clone_dir, logger=logger)
-        src_info, errors = parse_srcinfo(src_info_source)
+        srcinfo_source = check_output('makepkg', '--printsrcinfo', exception=None, cwd=clone_dir, logger=logger)
+        srcinfo, errors = parse_srcinfo(srcinfo_source)
         if errors:
             raise InvalidPackageInfo(errors)
 
-        return self.full_version(src_info.get('epoch'), src_info['pkgver'], src_info['pkgrel'])
+        return self.full_version(srcinfo.get('epoch'), srcinfo['pkgver'], srcinfo['pkgrel'])
 
     @classmethod
     def from_archive(cls: Type[Package], path: str, pacman: Pacman, aur_url: str) -> Package:
@@ -134,14 +133,14 @@ class Package:
         :param aur_url: AUR root url
         :return: package properties
         '''
-        with open(os.path.join(path, '.SRCINFO')) as fn:
-            src_info, errors = parse_srcinfo(fn.read())
+        with open(os.path.join(path, '.SRCINFO')) as srcinfo_file:
+            srcinfo, errors = parse_srcinfo(srcinfo_file.read())
         if errors:
             raise InvalidPackageInfo(errors)
-        packages = {key: PackageDescription() for key in src_info['packages'].keys()}
-        version = cls.full_version(src_info.get('epoch'), src_info['pkgver'], src_info['pkgrel'])
+        packages = {key: PackageDescription() for key in srcinfo['packages']}
+        version = cls.full_version(srcinfo.get('epoch'), srcinfo['pkgver'], srcinfo['pkgrel'])
 
-        return cls(src_info['pkgbase'], version, aur_url, packages)
+        return cls(srcinfo['pkgbase'], version, aur_url, packages)
 
     @staticmethod
     def dependencies(path: str) -> Set[str]:
@@ -150,17 +149,17 @@ class Package:
         :param path: path to package sources directory
         :return: list of package dependencies including makedepends array, but excluding packages from this base
         '''
-        with open(os.path.join(path, '.SRCINFO')) as fn:
-            src_info, errors = parse_srcinfo(fn.read())
+        with open(os.path.join(path, '.SRCINFO')) as srcinfo_file:
+            srcinfo, errors = parse_srcinfo(srcinfo_file.read())
         if errors:
             raise InvalidPackageInfo(errors)
-        makedepends = src_info.get('makedepends', [])
+        makedepends = srcinfo.get('makedepends', [])
         # sum over each package
-        depends: List[str] = src_info.get('depends', [])
-        for package in src_info['packages'].values():
+        depends: List[str] = srcinfo.get('depends', [])
+        for package in srcinfo['packages'].values():
             depends.extend(package.get('depends', []))
         # we are not interested in dependencies inside pkgbase
-        packages = set(src_info['packages'].keys())
+        packages = set(srcinfo['packages'].keys())
         return set(depends + makedepends) - packages
 
     @staticmethod

src/ahriman/models/sign_settings.py

@@ -43,6 +43,6 @@ class SignSettings(Enum):
         '''
         if value.lower() in ('package', 'packages', 'sign-package'):
             return SignSettings.SignPackages
-        elif value.lower() in ('repository', 'sign-repository'):
+        if value.lower() in ('repository', 'sign-repository'):
             return SignSettings.SignRepository
         raise InvalidOption(value)

src/ahriman/models/upload_settings.py

@@ -43,6 +43,6 @@ class UploadSettings(Enum):
         '''
         if value.lower() in ('rsync',):
             return UploadSettings.Rsync
-        elif value.lower() in ('s3',):
+        if value.lower() in ('s3',):
             return UploadSettings.S3
         raise InvalidOption(value)

src/ahriman/web/views/index.py

@@ -51,7 +51,7 @@ class IndexView(BaseView):
         packages = [
             {
                 'base': package.base,
-                'packages': [p for p in sorted(package.packages)],
+                'packages': list(sorted(package.packages)),
                 'status': status.status.value,
                 'timestamp': pretty_datetime(status.timestamp),
                 'version': package.version,