errbot 6.2.0__tar.gz → 6.2.1__tar.gz

{errbot-6.2.0 → errbot-6.2.1}/CHANGES.rst

@@ -1,3 +1,54 @@
+v6.2.1 (2026-06-06)
+-------------------
+
+fixes:
+
+- docs: add unreleased section (#1681)
+- fix: check only activate plugins listed in CORE_PLUGINS (#1601)
+- chore: bump jinja to 3.1.3 (#1684)
+- chore: bump actions/setup-python version (#1686, #1700, #1708, #1738, #1751)
+- chore: bump actions/checkout version (#1696, #1704, #1737, #1750, #1765)
+- chore: optimize Dockerfile (#1679)
+- docs: fix telegram install command (#1697)
+- chore: add python versions to test (#1705)
+- chore: remove python 3.8 support (#1707)
+- chore: use ruff for formatting (#1706)
+- chore: bump setuptools to 75.7.0 (#1709)
+- chore: bump pyOpenSSL to 24.3.0 (#1710)
+- chore: bump jinja2 to 3.1.5 and requests to 2.32.0 (#1714)
+- Fix: situationally broken apropos command (#1711)
+- chore: bump requests to 2.32.3 (#1715)
+- Fix: Newlines replaced with spaces in botcmd args (#1716)
+- chore: bump jinja2 to 3.1.6 (#1723)
+- chore: update errbot-backend-slackv3 version to 0.3.1 (#1725)
+- fix: Close and join thread pools between tests (#1724)
+- fix: type hints (#1698)
+- fix: update plugin config message (#1727)
+- docs: add example on how to use threaded replies (#1728)
+- fix: add extra_plugin_dir support to FullStackTest (#1726)
+- fix: add missing py 3.13 in tox (#1731)
+- fix: add filter to tar extract (#1730)
+- refactor: use importlib to find plugins in entry_points (#1669, #1733)
+- chore: bump setuptools to >=78.1.1 (#1734)
+- docs: update tox chat server URLs (#1739)
+- chore: update Dockerfile python version (#1744)
+- chore: update errbot-backend-slackv3 version to 0.3.2 (#1743)
+- fix: allow webtest to work on python 3.13 (#1729)
+- fix: add command in logged when blocked by cmdfilter (#1631)
+- chore: bump pyasn1 version (#1752)
+- chore: remove python 3.9 support (#1755)
+- chore: bump all dependencies (#1754)
+- feat: Add LXC image build (#1756)
+- chore: bump docker/setup-buildx-action version (#1758)
+- chore: bump docker/build-push-action version (#1759)
+- chore: bump docker/login-action version (#1760)
+- chore: bump docker/setup-qemu-action version (#1761)
+- docs: add command parameter section and minor doc edits (#1740)
+- chore: bump actions/upload-artifact version (#1762)
+- docs: add positional argument with default example (#1763)
+- feat: unique template names (#1764)
+
+
 v6.2.0 (2024-01-01)
 -------------------
 
@@ -38,7 +89,7 @@ fixes:
 - docs: fix example code in the testing section (#1643)
 - chore: update all core dependencies (#1651)
 - fix: use template file for webserver plugin echo output (#1654)
-- chore: update repos.json (#1660)
+- chore: update repos.json (#1660, #1741)
 - docs: add readthedocs yaml config (#1661)
 - fix: broken integration tests (#1668)
 - style: replace format() with f-strings (#1667)

{errbot-6.2.0/errbot.egg-info → errbot-6.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: errbot
-Version: 6.2.0
+Version: 6.2.1
 Summary: Errbot is a chatbot designed to be simple to extend with plugins written in Python.
 Home-page: http://errbot.io/
 Author: errbot.io
@@ -14,39 +14,54 @@ Classifier: Topic :: Communications :: Chat :: Internet Relay Chat
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/x-rst
 License-File: COPYING
-Requires-Dist: webtest==3.0.0
-Requires-Dist: setuptools==68.1.2
-Requires-Dist: flask==2.3.3
-Requires-Dist: requests==2.31.0
-Requires-Dist: jinja2==3.1.2
-Requires-Dist: pyOpenSSL==23.2.0
-Requires-Dist: colorlog==6.7.0
-Requires-Dist: markdown==3.4.4
-Requires-Dist: ansi==0.3.6
-Requires-Dist: Pygments==2.16.1
+Requires-Dist: webtest==3.0.7
+Requires-Dist: setuptools>=78.1.1
+Requires-Dist: flask==3.1.3
+Requires-Dist: requests==2.32.5
+Requires-Dist: jinja2==3.1.6
+Requires-Dist: pyOpenSSL==26.1.0
+Requires-Dist: colorlog==6.10.1
+Requires-Dist: markdown==3.10.2
+Requires-Dist: ansi==0.3.7
+Requires-Dist: Pygments==2.20.0
 Requires-Dist: pygments-markdown-lexer==0.1.0.dev39
-Requires-Dist: dulwich==0.21.5
-Requires-Dist: deepmerge==1.1.0
+Requires-Dist: dulwich==1.2.1
+Requires-Dist: deepmerge==2.0
+Requires-Dist: legacy-cgi==2.6.4; python_version >= "3.13"
 Provides-Extra: slack
-Requires-Dist: errbot-backend-slackv3==0.2.1; extra == "slack"
+Requires-Dist: errbot-backend-slackv3==0.3.2; extra == "slack"
 Provides-Extra: discord
 Requires-Dist: err-backend-discord==3.0.1; extra == "discord"
 Provides-Extra: mattermost
 Requires-Dist: err-backend-mattermost==3.0.0; extra == "mattermost"
 Provides-Extra: irc
-Requires-Dist: irc==20.3.0; extra == "irc"
+Requires-Dist: irc==20.5.0; extra == "irc"
 Provides-Extra: telegram
 Requires-Dist: python-telegram-bot==13.15; extra == "telegram"
 Provides-Extra: xmpp
-Requires-Dist: slixmpp==1.8.4; extra == "xmpp"
-Requires-Dist: pyasn1==0.5.0; extra == "xmpp"
-Requires-Dist: pyasn1-modules==0.3.0; extra == "xmpp"
+Requires-Dist: slixmpp==1.15.0; extra == "xmpp"
+Requires-Dist: pyasn1==0.6.3; extra == "xmpp"
+Requires-Dist: pyasn1-modules==0.4.2; extra == "xmpp"
 Requires-Dist: daemonize==2.5.0; sys_platform != "win32"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 .. image:: https://errbot.readthedocs.org/en/latest/_static/errbot.png
    :target: http://errbot.io
@@ -105,7 +120,7 @@ Chat servers support
 - `Mattermost <https://about.mattermost.com/>`_ (See `instructions <https://github.com/Vaelor/errbot-mattermost-backend>`__)
 - `RocketChat <https://rocket.chat/>`_ (See `instructions <https://github.com/cardoso/errbot-rocketchat>`__)
 - `Skype <https://www.skype.com/>`_ (See `instructions <https://github.com/errbotio/errbot-backend-skype>`__)
-- `TOX <https://tox.im/>`_ (See `instructions <https://github.com/errbotio/err-backend-tox>`__)
+- `TOX <https://tox.chat/>`_ (See `instructions <https://github.com/errbotio/err-backend-tox>`__)
 - `VK <https://vk.com/>`_ (See `instructions <https://github.com/Ax3Effect/errbot-vk>`__)
 - `Zulip <https://zulipchat.com/>`_ (See `instructions <https://github.com/zulip/errbot-backend-zulip>`__)
 
@@ -156,7 +171,7 @@ Installation
 Prerequisites
 ~~~~~~~~~~~~~
 
-Errbot runs under Python 3.6+ on Linux, Windows and Mac. For some chatting systems you'll need a key or a login for your bot to access it.
+Errbot runs under Python 3.10+ on Linux, Windows and Mac. For some chatting systems you'll need a key or a login for your bot to access it.
 
 Quickstart
 ~~~~~~~~~~
@@ -277,6 +292,57 @@ Contribution to Errbot itself
 Feel free to fork and propose changes on `github <https://www.github.com/errbotio/errbot>`_
 
 
+v6.2.1 (2026-06-06)
+-------------------
+
+fixes:
+
+- docs: add unreleased section (#1681)
+- fix: check only activate plugins listed in CORE_PLUGINS (#1601)
+- chore: bump jinja to 3.1.3 (#1684)
+- chore: bump actions/setup-python version (#1686, #1700, #1708, #1738, #1751)
+- chore: bump actions/checkout version (#1696, #1704, #1737, #1750, #1765)
+- chore: optimize Dockerfile (#1679)
+- docs: fix telegram install command (#1697)
+- chore: add python versions to test (#1705)
+- chore: remove python 3.8 support (#1707)
+- chore: use ruff for formatting (#1706)
+- chore: bump setuptools to 75.7.0 (#1709)
+- chore: bump pyOpenSSL to 24.3.0 (#1710)
+- chore: bump jinja2 to 3.1.5 and requests to 2.32.0 (#1714)
+- Fix: situationally broken apropos command (#1711)
+- chore: bump requests to 2.32.3 (#1715)
+- Fix: Newlines replaced with spaces in botcmd args (#1716)
+- chore: bump jinja2 to 3.1.6 (#1723)
+- chore: update errbot-backend-slackv3 version to 0.3.1 (#1725)
+- fix: Close and join thread pools between tests (#1724)
+- fix: type hints (#1698)
+- fix: update plugin config message (#1727)
+- docs: add example on how to use threaded replies (#1728)
+- fix: add extra_plugin_dir support to FullStackTest (#1726)
+- fix: add missing py 3.13 in tox (#1731)
+- fix: add filter to tar extract (#1730)
+- refactor: use importlib to find plugins in entry_points (#1669, #1733)
+- chore: bump setuptools to >=78.1.1 (#1734)
+- docs: update tox chat server URLs (#1739)
+- chore: update Dockerfile python version (#1744)
+- chore: update errbot-backend-slackv3 version to 0.3.2 (#1743)
+- fix: allow webtest to work on python 3.13 (#1729)
+- fix: add command in logged when blocked by cmdfilter (#1631)
+- chore: bump pyasn1 version (#1752)
+- chore: remove python 3.9 support (#1755)
+- chore: bump all dependencies (#1754)
+- feat: Add LXC image build (#1756)
+- chore: bump docker/setup-buildx-action version (#1758)
+- chore: bump docker/build-push-action version (#1759)
+- chore: bump docker/login-action version (#1760)
+- chore: bump docker/setup-qemu-action version (#1761)
+- docs: add command parameter section and minor doc edits (#1740)
+- chore: bump actions/upload-artifact version (#1762)
+- docs: add positional argument with default example (#1763)
+- feat: unique template names (#1764)
+
+
 v6.2.0 (2024-01-01)
 -------------------
 
@@ -317,7 +383,7 @@ fixes:
 - docs: fix example code in the testing section (#1643)
 - chore: update all core dependencies (#1651)
 - fix: use template file for webserver plugin echo output (#1654)
-- chore: update repos.json (#1660)
+- chore: update repos.json (#1660, #1741)
 - docs: add readthedocs yaml config (#1661)
 - fix: broken integration tests (#1668)
 - style: replace format() with f-strings (#1667)

{errbot-6.2.0 → errbot-6.2.1}/README.rst

@@ -55,7 +55,7 @@ Chat servers support
 - `Mattermost <https://about.mattermost.com/>`_ (See `instructions <https://github.com/Vaelor/errbot-mattermost-backend>`__)
 - `RocketChat <https://rocket.chat/>`_ (See `instructions <https://github.com/cardoso/errbot-rocketchat>`__)
 - `Skype <https://www.skype.com/>`_ (See `instructions <https://github.com/errbotio/errbot-backend-skype>`__)
-- `TOX <https://tox.im/>`_ (See `instructions <https://github.com/errbotio/err-backend-tox>`__)
+- `TOX <https://tox.chat/>`_ (See `instructions <https://github.com/errbotio/err-backend-tox>`__)
 - `VK <https://vk.com/>`_ (See `instructions <https://github.com/Ax3Effect/errbot-vk>`__)
 - `Zulip <https://zulipchat.com/>`_ (See `instructions <https://github.com/zulip/errbot-backend-zulip>`__)
 
@@ -106,7 +106,7 @@ Installation
 Prerequisites
 ~~~~~~~~~~~~~
 
-Errbot runs under Python 3.6+ on Linux, Windows and Mac. For some chatting systems you'll need a key or a login for your bot to access it.
+Errbot runs under Python 3.10+ on Linux, Windows and Mac. For some chatting systems you'll need a key or a login for your bot to access it.
 
 Quickstart
 ~~~~~~~~~~

{errbot-6.2.0 → errbot-6.2.1}/errbot/__init__.py

@@ -3,9 +3,8 @@ import inspect
 import logging
 import re
 import shlex
-import sys
 from functools import wraps
-from typing import Any, Callable, List, Optional, Tuple
+from typing import Any, Callable, Optional, Tuple
 
 from .backends.base import AWAY, DND, OFFLINE, ONLINE, Message  # noqa
 from .botplugin import (  # noqa
@@ -16,7 +15,7 @@ from .botplugin import (  # noqa
     ShlexArgParser,
     ValidationException,
 )
-from .core_plugins.wsview import WebView, route
+from .core_plugins.wsview import route
 from .flow import FLOW_END, BotFlow, Flow, FlowRoot
 
 __all__ = [
@@ -259,7 +258,7 @@ def botmatch(*args, **kwargs):
     """
     Decorator for regex-based message match.
 
-    :param *args: The regular expression a message should match against in order to
+    :param args: The regular expression a message should match against in order to
                    trigger the command.
     :param flags: The `flags` parameter which should be passed to :func:`re.compile()`. This
         allows the expression's behaviour to be modified, such as making it case-insensitive
@@ -521,9 +520,9 @@ def webhook(
     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,
@@ -563,7 +562,7 @@ def cmdfilter(*args, **kwargs):
                command is authorized or not.
             \"\"\"
             # If wishing to block the incoming command:
-            return None, None, None
+            return None, cmd, args
             # Otherwise pass data through to the (potential) next filter:
             return msg, cmd, args
 

{errbot-6.2.0 → errbot-6.2.1}/errbot/backend_plugin_manager.py

@@ -15,7 +15,7 @@ class PluginNotFoundException(Exception):
 
 
 def enumerate_backend_plugins(
-    all_plugins_paths: List[Union[str, Path]]
+    all_plugins_paths: List[Union[str, Path]],
 ) -> Iterator[PluginInfo]:
     plugin_places = [Path(root) for root in all_plugins_paths]
     for path in plugin_places:

{errbot-6.2.0 → errbot-6.2.1}/errbot/backends/base.py

@@ -4,7 +4,7 @@ import random
 import time
 from abc import ABC, abstractmethod
 from collections import defaultdict, deque
-from typing import Any, BinaryIO, List, Mapping, Optional, Sequence, Tuple
+from typing import Any, BinaryIO, List, Mapping, Optional, Sequence, Tuple, Type
 
 log = logging.getLogger(__name__)
 
@@ -223,7 +223,7 @@ class Room(Identifier):
         """
         Invite one or more people into the room.
 
-        :param *args:
+        :param args:
             One or more identifiers to invite into the room.
         """
         raise NotImplementedError(
@@ -391,7 +391,7 @@ class Message:
         return self._extras
 
     @property
-    def flow(self) -> "errbot.Flow":
+    def flow(self) -> Type["errbot.Flow"]: # noqa: F821
         """
         Get the conversation flow for this message.
 

{errbot-6.2.0 → errbot-6.2.1}/errbot/backends/irc.py

@@ -49,11 +49,11 @@ IRC_CHRS = CharacterTable(
     bg_default=NSC("\x03,"),
     fx_reset=NSC("\x03"),
     fx_bold=NSC("\x02"),
-    fx_italic=NSC("\x1D"),
-    fx_underline=NSC("\x1F"),
-    fx_not_italic=NSC("\x0F"),
-    fx_not_underline=NSC("\x0F"),
-    fx_normal=NSC("\x0F"),
+    fx_italic=NSC("\x1d"),
+    fx_underline=NSC("\x1f"),
+    fx_not_italic=NSC("\x0f"),
+    fx_not_underline=NSC("\x0f"),
+    fx_normal=NSC("\x0f"),
     fixed_width="",
     end_fixed_width="",
     inline_code="",
@@ -315,7 +315,7 @@ class IRCRoom(Room):
         """
         Invite one or more people into the room.
 
-        :param \*args:
+        :param args:
             One or more nicks to invite into the room.
         """
         for nick in args:

{errbot-6.2.0 → errbot-6.2.1}/errbot/backends/telegram_messenger.py

@@ -1,6 +1,6 @@
 import logging
 import sys
-from typing import Any, BinaryIO, List, Optional, Union
+from typing import Any, BinaryIO, Optional, Union
 
 from errbot.backends.base import (
     ONLINE,

{errbot-6.2.0 → errbot-6.2.1}/errbot/backends/test.py

@@ -1,9 +1,10 @@
 import importlib
 import logging
+import pathlib
 import sys
 import textwrap
 import unittest
-from os.path import abspath, sep
+from os.path import sep
 from queue import Empty, Queue
 from tempfile import mkdtemp
 from threading import Thread
@@ -521,6 +522,10 @@ class TestBot:
         log.info("Main bot thread quits")
         self.bot.zap_queues()
         self.bot.reset_rooms()
+        self.bot.thread_pool.close()
+        self.bot.thread_pool.join()
+        self.bot.flow_executor._pool.close()
+        self.bot.flow_executor._pool.join()
         self.bot_thread = None
 
     def pop_message(self, timeout: int = 5, block: bool = True):
@@ -600,25 +605,31 @@ class FullStackTest(unittest.TestCase, TestBot):
                 self.assertIn('Err version', self.pop_message())
     """
 
+    def __init__(
+        self,
+        methodName,
+        extra_plugin_dir=None,
+        loglevel=logging.DEBUG,
+        extra_config=None,
+    ):
+        self.bot_thread = None
+        super().__init__(methodName)
+
     def setUp(
         self,
         extra_plugin_dir=None,
-        extra_test_file=None,
         loglevel=logging.DEBUG,
         extra_config=None,
     ) -> None:
         """
         :param extra_plugin_dir: Path to a directory from which additional
             plugins should be loaded.
-        :param extra_test_file: [Deprecated but kept for backward-compatibility,
-            use extra_plugin_dir instead]
-            Path to an additional plugin which should be loaded.
         :param loglevel: Logging verbosity. Expects one of the constants
             defined by the logging module.
         :param extra_config: Piece of extra bot config in a dict.
         """
-        if extra_plugin_dir is None and extra_test_file is not None:
-            extra_plugin_dir = sep.join(abspath(extra_test_file).split(sep)[:-2])
+        if extra_plugin_dir is None:
+            extra_plugin_dir = str(pathlib.Path(".").resolve().parent.parent.absolute())
 
         self.setup(
             extra_plugin_dir=extra_plugin_dir,

{errbot-6.2.0 → errbot-6.2.1}/errbot/backends/xmpp.py

@@ -5,7 +5,7 @@ import sys
 from datetime import datetime
 from functools import lru_cache
 from time import sleep
-from typing import Callable, List, Optional, Tuple
+from typing import Callable, List, Optional, Tuple, Union
 
 from errbot.backends.base import (
     AWAY,
@@ -28,7 +28,6 @@ log = logging.getLogger(__name__)
 try:
     from slixmpp import JID, ClientXMPP
     from slixmpp.exceptions import IqError
-    from slixmpp.xmlstream import cert, resolver
 
 except ImportError:
     log.exception("Could not start the XMPP backend")
@@ -274,7 +273,7 @@ class XMPPRoom(XMPPIdentifier, Room):
         """
         Invite one or more people into the room.
 
-        :*args:
+        :param args:
             One or more JID's to invite into the room.
         """
         room = str(self)

{errbot-6.2.0 → errbot-6.2.1}/errbot/botplugin.py

@@ -44,7 +44,7 @@ def recurse_check_structure(sample: Any, to_check: Any) -> None:
             recurse_check_structure(sample[0], element)
         return
 
-    if sample_type == dict:
+    if sample_type == dict: # noqa: E721
         for key in sample:
             if key not in to_check:
                 raise ValidationException(f"{to_check} doesn't contain the key {key}.")
@@ -128,7 +128,7 @@ class Command:
         self.definition = cmd_type(*((function,) + cmd_args), **cmd_kwargs)
 
     def append_args(self, args, kwargs):
-        from errbot import arg_botcmd, update_wrapper
+        from errbot import update_wrapper
 
         if hasattr(self.definition, "_err_command_parser"):
             update_wrapper(self.definition, args, kwargs)
@@ -701,6 +701,7 @@ class BotPlugin(BotPluginBase):
             template_parameters=template_parameters,
             in_reply_to=in_reply_to,
             groupchat_nick_reply=groupchat_nick_reply,
+            plugin_name=self.name,
         )
 
     def build_identifier(self, txtrep: str) -> Identifier:

{errbot-6.2.0 → errbot-6.2.1}/errbot/cli.py

@@ -19,10 +19,10 @@ import ast
 import logging
 import os
 import sys
+from collections.abc import Mapping
 from os import W_OK, access, getcwd, path, sep
 from pathlib import Path
 from platform import system
-from typing import Optional, Union
 
 from errbot.bootstrap import CORE_BACKENDS
 from errbot.logs import root_logger
@@ -65,7 +65,7 @@ def get_config(config_path: str):
         log.error(f"I cannot find the config file {config_path}.")
         log.error("You can change this path with the -c parameter see --help")
         log.info(
-            f'You can use the template {os.path.realpath(os.path.join(__file__, os.pardir, "config-template.py"))}'
+            f"You can use the template {os.path.realpath(os.path.join(__file__, os.pardir, 'config-template.py'))}"
             f" as a base and copy it to {config_path}."
         )
         log.info("You can then customize it.")
@@ -82,9 +82,7 @@ def get_config(config_path: str):
         exit(-1)
 
 
-def _read_dict() -> dict:
-    from collections.abc import Mapping
-
+def _read_dict() -> Mapping:
     new_dict = ast.literal_eval(sys.stdin.read())
     if not isinstance(new_dict, Mapping):
         raise ValueError(

{errbot-6.2.0 → errbot-6.2.1}/errbot/config-template.py

@@ -35,7 +35,7 @@ import logging
 # "Gitter"   - see https://gitter.im/ (follow instructions from https://github.com/errbotio/err-backend-gitter)
 
 # Open protocols:
-# "TOX"      - see https://tox.im/ (follow instructions from https://github.com/errbotio/err-backend-tox)
+# "TOX"      - see https://tox.chat/ (follow instructions from https://github.com/errbotio/err-backend-tox)
 # "IRC"      - for classic IRC or bridged services like https://gitter.im
 # "XMPP"     - the Extensible Messaging and Presence Protocol (https://xmpp.org/)
 # "Telegram" - cloud-based mobile and desktop messaging app with a focus