diff --git a/CHANGES.rst b/CHANGES.rst index 9334013d2..1c41cf3f1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,10 @@ +v9.9.9 (unreleased) +------------------- + +fixes: + +- docs: add unreleased section (#1681) + v6.2.0 (2024-01-01) ------------------- diff --git a/errbot/__init__.py b/errbot/__init__.py index 6ad54c51b..3e4ebab6b 100644 --- a/errbot/__init__.py +++ b/errbot/__init__.py @@ -521,9 +521,9 @@ def a_webhook(self, payload): if isinstance(args[0], str): # first param is uri_rule. return lambda func: _tag_webhook( func, - args[0] - if args[0] == "/" - else args[0].rstrip("/"), # trailing / is also be stripped on incoming. + ( + args[0] if args[0] == "/" else args[0].rstrip("/") + ), # trailing / is also be stripped on incoming. methods=methods, form_param=form_param, raw=raw, diff --git a/errbot/plugin_manager.py b/errbot/plugin_manager.py index df741eb82..6d5490a0a 100644 --- a/errbot/plugin_manager.py +++ b/errbot/plugin_manager.py @@ -1,4 +1,5 @@ """ Logic related to plugin loading and lifecycle """ + import logging import os import subprocess @@ -243,9 +244,9 @@ def _install_potential_package_dependencies( exc_info = install_packages(req_path) if exc_info is not None: typ, value, trace = exc_info - feedback[ - path - ] = f'{typ}: {value}\n{"".join(traceback.format_tb(trace))}' + feedback[path] = ( + f'{typ}: {value}\n{"".join(traceback.format_tb(trace))}' + ) else: msg, _ = check_dependencies(req_path) if msg and path not in feedback: # favor the first error. @@ -294,9 +295,9 @@ def _load_plugins_generic( continue if len(plugin_classes) > 1: # TODO: This is something we can support as "subplugins" or something similar. - feedback[ - path - ] = "Contains more than one plugin, only one will be loaded." + feedback[path] = ( + "Contains more than one plugin, only one will be loaded." + ) # instantiate the plugin object. _, clazz = plugin_classes[0] diff --git a/tests/cascade_dependencies_test.py b/tests/cascade_dependencies_test.py index bbe920cd9..3e2b94f38 100644 --- a/tests/cascade_dependencies_test.py +++ b/tests/cascade_dependencies_test.py @@ -1,7 +1,7 @@ import os import pathlib - from unittest import mock + import pytest extra_plugin_dir = os.path.join( diff --git a/tests/commands_test.py b/tests/commands_test.py index 5eaaa8dd1..f3cdbc5a7 100644 --- a/tests/commands_test.py +++ b/tests/commands_test.py @@ -7,9 +7,9 @@ from queue import Empty from shutil import rmtree from tempfile import mkdtemp +from unittest.mock import MagicMock import pytest -from unittest.mock import MagicMock extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), "dummy_plugin") diff --git a/tests/core_test.py b/tests/core_test.py index 43fcedd3a..77430116e 100755 --- a/tests/core_test.py +++ b/tests/core_test.py @@ -1,4 +1,5 @@ """Test _admins_to_notify wrapper functionality""" + import pytest extra_config = {"BOT_ADMINS_NOTIFICATIONS": "zoni@localdomain"}