Skip to content

Commit

Permalink
docs: add unreleased section to CHANGES (errbotio#1681)
Browse files Browse the repository at this point in the history
* docs: add unreleased section to CHANGES

* style: black/isort files
  • Loading branch information
sijis authored Jan 27, 2024
1 parent 3f56358 commit d5e3ba7
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 11 deletions.
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
v9.9.9 (unreleased)
-------------------

fixes:

- docs: add unreleased section (#1681)

v6.2.0 (2024-01-01)
-------------------

Expand Down
6 changes: 3 additions & 3 deletions errbot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
13 changes: 7 additions & 6 deletions errbot/plugin_manager.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
""" Logic related to plugin loading and lifecycle """

import logging
import os
import subprocess
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion tests/cascade_dependencies_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import pathlib

from unittest import mock

import pytest

extra_plugin_dir = os.path.join(
Expand Down
2 changes: 1 addition & 1 deletion tests/commands_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
1 change: 1 addition & 0 deletions tests/core_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Test _admins_to_notify wrapper functionality"""

import pytest

extra_config = {"BOT_ADMINS_NOTIFICATIONS": "zoni@localdomain"}
Expand Down

0 comments on commit d5e3ba7

Please sign in to comment.