errbot 6.1.9__tar.gz → 6.2.0__tar.gz

{errbot-6.1.9 → errbot-6.2.0}/CHANGES-4x.rst

@@ -71,7 +71,7 @@ features:
 
 fixes:
 
--  fixed imporlib/use pip as process (#835) (thx Raphael Wouters)
+-  fixed importlib/use pip as process (#835) (thx Raphael Wouters)
 -  if pip is not found, don’t crash errbot
 -  build_identifier to send message to IRC channels (thx mr Shu)
 

{errbot-6.1.9 → errbot-6.2.0}/CHANGES-5x.rst

@@ -19,7 +19,7 @@ features:
    Honig)
 -  Add support for specifying a custom log formatter (Thx Oz Linden)
 -  Add Sentry transport support (thx Dylan Page)
--  File transfert support (send_stream_request) on the Hipchat backend
+-  File transfer support (send_stream_request) on the Hipchat backend
    (thx Brad Payne)
 -  Show user where they are in a flow (thx Elijah Roberts)
 -  Help commands are sorted alphabetically (thx Fabian Chong)
@@ -35,7 +35,7 @@ fixes:
 -  Windows: Config directories as raw string (Thx defAnfaenger)
 -  Windows: Repo Manager first time update (Thx Jake Shadle)
 -  Slack: fix Slack identities to be hashable
--  Hipchat: fix HicpChat Server XMPP namespace (Thx Antti Palsola)
+-  Hipchat: fix HipChat Server XMPP namespace (Thx Antti Palsola)
 -  Hipchat: more aggressive cashing of user list to avoid API quota
    exceeds (thx Roman)
 

{errbot-6.1.9 → errbot-6.2.0}/CHANGES-pre-v4.rst

@@ -180,7 +180,7 @@ Minor improvements
 ~~~~~~~~~~~~~~~~~~
 
 - hipchat endpoint can be used (#348)
-- XMPP server parameter can be overriden
+- XMPP server parameter can be overridden
 - deep internal reorganisation of the bot: the most visible change is that internal commands have been split into internal plugins.
 - IRC backend: we have now a reconnection logic on disconnect and on kick (see ``IRC_RECONNECT_ON_DISCONNECT`` in the config file for example)
 
@@ -269,7 +269,7 @@ features:
 - third party backends (they are plugins too)
 - completely revamped backup/restore feature.
 - hipchat endpoint can be used (#348)
-- XMPP server parameter can be overriden
+- XMPP server parameter can be overridden
 - Identifiers are now generic (not tight to XMPP anymore)
 
 fixes:
@@ -308,7 +308,7 @@ features:
 
 - New serverless tox backend (see http://tox.im for more info)
 - New Presence callbacks with status messages etc.
-- New file transfert support (upload and downloads) for selected backends
+- New file transfer support (upload and downloads) for selected backends
 - New MUC management API
 - added err-githubhook to the official repo list (thx Daniele Sluijters)
 - added err-linksBot to the official repo list (thx Arnaud Vazard)
@@ -402,7 +402,7 @@ features:
 - Added the !room create command for adhoc room creation (google talk)
 - Added sedbot to the official repos
 - Added support for plugin based webviews
-- Add err-agressive-keepalive to the official repos
+- Add err-aggressive-keepalive to the official repos
 - Allow botcmd's to yield values
 - Allow configuration of MESSAGE_SIZE_LIMIT
 
@@ -430,7 +430,7 @@ features:
 - SSL support for webhook callbacks
 - JID unicode support
 - Per user command history (Thanks to Leonid S. Usov https://github.com/leonid-s-usov)
-- HIDE_RESTRICTED_COMMANDS option added to filter out the non accessoble commands from the help  (Thanks to Leonid S. Usov https://github.com/leonid-s-usov)
+- HIDE_RESTRICTED_COMMANDS option added to filter out the non accessible commands from the help  (Thanks to Leonid S. Usov https://github.com/leonid-s-usov)
 - err-markovbot has been added to the official plugins list (Thanks to Max Wagner https://github.com/MaxWagner)
 - the version parsing now supports beta, alpha, rc etc ... statuses
 
@@ -508,7 +508,7 @@ fixes:
 
 - bot initiated messages were not correctly callbacked on jabber backend
 - !apropos was generating an unicode error thx to https://github.com/zoni for the fix
-- corrected a serie of issues related to the sharedmiddleware on flask
+- corrected a series of issues related to the sharedmiddleware on flask
 - fixed a regression on the IRC backend thx to https://github.com/nvdk for helping on those
 
 features:
@@ -597,7 +597,7 @@ fixes:
 - corrected a threading issue that was preventing err to quit
 - the python shebangs lines where not generic
 - the config path is not inserted first so we don't conflict with other installs
-- corrected a corruption of the configs on some persistance stores on shutdown
+- corrected a corruption of the configs on some persistence stores on shutdown
 
 features:
 

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

@@ -1,3 +1,52 @@
+v6.2.0 (2024-01-01)
+-------------------
+
+breaking:
+
+- backend/slack: remove slack and slack_rtm built-in backends (#1581)
+- core/logging: deprecate SENTRY_TRANSPORT config (#1604)
+- core: removing py37 support (#1652)
+
+features:
+
+- core/plugins: detect plugins using entrypoints (#1590)
+- core/logging: add new SENTRY_OPTIONS config (#1597)
+- core/plugins: make slack, mattermost and discord backends available as install requirements (#1611)
+
+fixes:
+
+- docs: add unreleased section (#1576)
+- docs: update broken URL for Markdown Extra (#1572)
+- chore: bump actions/setup-python version (#1575, #1593, #1609, #1626, #1642, #1650, #1659, #1674)
+- backend/telegram: fix missing imports (#1574)
+- chore: ci improvements (#1577, #1583)
+- chore: add docs build to ci (#1582)
+- backend/xmpp: fix forward type references (#1578)
+- chore: remove campfire references (#1584)
+- chore/setup: fix exception when installing on python <3.7 (#1585)
+- docs: typos (#1589, #1594)
+- chore: simplify isort config using black (#1595)
+- fix: detecting entrypoint module paths (#1603)
+- chore: fix Docker build to use local tree (#1608)
+- chore: bump actions/checkout version (#1610, #1625, #1637, #1644, #1653, #1656, #1658, #1663)
+- docs: link to external Discord plugin documentation (#1615)
+- chore: add ARG to Dockerfile and add proper stop signal (#1613)
+- fix: update module versions and build (#1627)
+- chore: update setuptools version (#1628)
+- refactor: detecting entry point plugins (#1630)
+- chore: bump mr-smithers-excellent/docker-build-push version (#1633)
+- 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)
+- docs: add readthedocs yaml config (#1661)
+- fix: broken integration tests (#1668)
+- style: replace format() with f-strings (#1667)
+- migrate from external mock package to stdlib unittest.mock (#1673)
+- fix: import of Mapping from collections.abc (#1675)
+- backend: update irc, telegram and xmpp dependencies (#1655)
+
+
 v6.1.9 (2022-06-11)
 -------------------
 
@@ -52,7 +101,7 @@ features:
 fixes:
 
 - core/cli: failure when passing relative directory during --init (#1511)
-- backend/xmpp: include message delayed for send/recieved messages (#1270)
+- backend/xmpp: include message delayed for send/received messages (#1270)
 - backend/xmpp: "unexpected keyword argument 'wait'" when connecting (#1507)
 - docs: update broken readme link to plugin development docs (#1504)
 - close threadpool on exit (#1486)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: errbot
-Version: 6.1.9
+Version: 6.2.0
 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,17 +14,39 @@ 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.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Description-Content-Type: text/x-rst
-Provides-Extra: IRC
+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: pygments-markdown-lexer==0.1.0.dev39
+Requires-Dist: dulwich==0.21.5
+Requires-Dist: deepmerge==1.1.0
 Provides-Extra: slack
-Provides-Extra: slack-rtm
+Requires-Dist: errbot-backend-slackv3==0.2.1; 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"
 Provides-Extra: telegram
-Provides-Extra: XMPP
-License-File: COPYING
+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: daemonize==2.5.0; sys_platform != "win32"
 
 .. image:: https://errbot.readthedocs.org/en/latest/_static/errbot.png
    :target: http://errbot.io
@@ -71,16 +93,15 @@ Chat servers support
 **Built-in**
 
 - IRC support
-- `Slack support <https://slack.com/>`_
 - `Telegram support <https://www.telegram.org/>`_
 - `XMPP support <http://xmpp.org>`_
 
 **With add-ons**
 
-- `CampFire <https://campfirenow.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-campfire>`__)
-- `Webex <https://www.webex.com/>`_ (See `instructions <https://github.com/marksull/err-backend-cisco-webex-teams>`__)
-- `Discord <https://www.discordapp.com/>`_ (See `instructions <https://github.com/gbin/err-backend-discord>`__)
+- `Slack support <https://slack.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-slackv3>`__)
+- `Discord <https://www.discordapp.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-discord>`__)
 - `Gitter support <https://gitter.im/>`_ (See `instructions <https://github.com/errbotio/err-backend-gitter>`__)
+- `Webex <https://www.webex.com/>`_ (See `instructions <https://github.com/marksull/err-backend-cisco-webex-teams>`__)
 - `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>`__)
@@ -108,7 +129,7 @@ Developer features
 - Presetup storage for every plugin i.e. ``self['foo'] = 'bar'`` persists the value.
 - Conversation flows to track conversation states from users.
 - Webhook callbacks support
-- supports `markdown extras <https://pythonhosted.org/Markdown/extensions/extra.html>`_ formatting with tables, embedded images, links etc.
+- supports `markdown extras <https://markdown-extra.readthedocs.io/>`_ formatting with tables, embedded images, links etc.
 - configuration helper to allow your plugin to be configured by chat
 - Text development/debug consoles
 - Self-documenting: your docstrings become help automatically
@@ -159,12 +180,12 @@ It will show you a prompt `>>>` so you can talk to your bot directly! Try `!help
 Adding support for a chat system
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For the built-ins, just use one of those options `slack, telegram, IRC, XMPP` with pip, you can still do it
+For the built-ins, just use one of those options `telegram, IRC, XMPP` with pip, you can still do it
 after the initial installation to add the missing support for example ::
 
-   $ pip install "errbot[slack]"
+   $ pip install "errbot[irc]"
 
-For the external ones (Skype, Gitter, Discord etc ...), please follow their respective github pages for instructions.
+For the external ones (Slack, Discord, Gitter, Skype, etc ...), please follow their respective github pages for instructions.
 
 Configuration
 ~~~~~~~~~~~~~
@@ -256,6 +277,55 @@ Contribution to Errbot itself
 Feel free to fork and propose changes on `github <https://www.github.com/errbotio/errbot>`_
 
 
+v6.2.0 (2024-01-01)
+-------------------
+
+breaking:
+
+- backend/slack: remove slack and slack_rtm built-in backends (#1581)
+- core/logging: deprecate SENTRY_TRANSPORT config (#1604)
+- core: removing py37 support (#1652)
+
+features:
+
+- core/plugins: detect plugins using entrypoints (#1590)
+- core/logging: add new SENTRY_OPTIONS config (#1597)
+- core/plugins: make slack, mattermost and discord backends available as install requirements (#1611)
+
+fixes:
+
+- docs: add unreleased section (#1576)
+- docs: update broken URL for Markdown Extra (#1572)
+- chore: bump actions/setup-python version (#1575, #1593, #1609, #1626, #1642, #1650, #1659, #1674)
+- backend/telegram: fix missing imports (#1574)
+- chore: ci improvements (#1577, #1583)
+- chore: add docs build to ci (#1582)
+- backend/xmpp: fix forward type references (#1578)
+- chore: remove campfire references (#1584)
+- chore/setup: fix exception when installing on python <3.7 (#1585)
+- docs: typos (#1589, #1594)
+- chore: simplify isort config using black (#1595)
+- fix: detecting entrypoint module paths (#1603)
+- chore: fix Docker build to use local tree (#1608)
+- chore: bump actions/checkout version (#1610, #1625, #1637, #1644, #1653, #1656, #1658, #1663)
+- docs: link to external Discord plugin documentation (#1615)
+- chore: add ARG to Dockerfile and add proper stop signal (#1613)
+- fix: update module versions and build (#1627)
+- chore: update setuptools version (#1628)
+- refactor: detecting entry point plugins (#1630)
+- chore: bump mr-smithers-excellent/docker-build-push version (#1633)
+- 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)
+- docs: add readthedocs yaml config (#1661)
+- fix: broken integration tests (#1668)
+- style: replace format() with f-strings (#1667)
+- migrate from external mock package to stdlib unittest.mock (#1673)
+- fix: import of Mapping from collections.abc (#1675)
+- backend: update irc, telegram and xmpp dependencies (#1655)
+
+
 v6.1.9 (2022-06-11)
 -------------------
 
@@ -310,7 +380,7 @@ features:
 fixes:
 
 - core/cli: failure when passing relative directory during --init (#1511)
-- backend/xmpp: include message delayed for send/recieved messages (#1270)
+- backend/xmpp: include message delayed for send/received messages (#1270)
 - backend/xmpp: "unexpected keyword argument 'wait'" when connecting (#1507)
 - docs: update broken readme link to plugin development docs (#1504)
 - close threadpool on exit (#1486)
@@ -518,5 +588,3 @@ features:
 -  Added a default parameter to the storage context manager
 
 .. v9.9.9 (leave that there so master doesn't complain)
-
-

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

@@ -43,16 +43,15 @@ Chat servers support
 **Built-in**
 
 - IRC support
-- `Slack support <https://slack.com/>`_
 - `Telegram support <https://www.telegram.org/>`_
 - `XMPP support <http://xmpp.org>`_
 
 **With add-ons**
 
-- `CampFire <https://campfirenow.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-campfire>`__)
-- `Webex <https://www.webex.com/>`_ (See `instructions <https://github.com/marksull/err-backend-cisco-webex-teams>`__)
-- `Discord <https://www.discordapp.com/>`_ (See `instructions <https://github.com/gbin/err-backend-discord>`__)
+- `Slack support <https://slack.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-slackv3>`__)
+- `Discord <https://www.discordapp.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-discord>`__)
 - `Gitter support <https://gitter.im/>`_ (See `instructions <https://github.com/errbotio/err-backend-gitter>`__)
+- `Webex <https://www.webex.com/>`_ (See `instructions <https://github.com/marksull/err-backend-cisco-webex-teams>`__)
 - `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>`__)
@@ -80,7 +79,7 @@ Developer features
 - Presetup storage for every plugin i.e. ``self['foo'] = 'bar'`` persists the value.
 - Conversation flows to track conversation states from users.
 - Webhook callbacks support
-- supports `markdown extras <https://pythonhosted.org/Markdown/extensions/extra.html>`_ formatting with tables, embedded images, links etc.
+- supports `markdown extras <https://markdown-extra.readthedocs.io/>`_ formatting with tables, embedded images, links etc.
 - configuration helper to allow your plugin to be configured by chat
 - Text development/debug consoles
 - Self-documenting: your docstrings become help automatically
@@ -131,12 +130,12 @@ It will show you a prompt `>>>` so you can talk to your bot directly! Try `!help
 Adding support for a chat system
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For the built-ins, just use one of those options `slack, telegram, IRC, XMPP` with pip, you can still do it
+For the built-ins, just use one of those options `telegram, IRC, XMPP` with pip, you can still do it
 after the initial installation to add the missing support for example ::
 
-   $ pip install "errbot[slack]"
+   $ pip install "errbot[irc]"
 
-For the external ones (Skype, Gitter, Discord etc ...), please follow their respective github pages for instructions.
+For the external ones (Slack, Discord, Gitter, Skype, etc ...), please follow their respective github pages for instructions.
 
 Configuration
 ~~~~~~~~~~~~~

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

@@ -377,9 +377,7 @@ def arg_botcmd(
         argparse_args = args[1:]
 
     def decorator(func):
-
         if not hasattr(func, "_err_command"):
-
             err_command_parser = ArgumentParser(
                 prog=name or func.__name__,
                 description=func.__doc__,
@@ -387,7 +385,6 @@ def arg_botcmd(
 
             @wraps(func)
             def wrapper(self, msg, args):
-
                 # Attempt to sanitize arguments of bad characters
                 try:
                     sanitizer_re = re.compile(

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

@@ -5,7 +5,7 @@ from typing import Any, Iterator, List, Type, Union
 
 from errbot.plugin_info import PluginInfo
 
-from .utils import collect_roots
+from .utils import collect_roots, entry_point_plugins
 
 log = logging.getLogger(__name__)
 
@@ -44,7 +44,8 @@ class BackendPluginManager:
         self._base_class = base_class
 
         self.plugin_info = None
-        all_plugins_paths = collect_roots((base_search_dir, extra_search_dirs))
+        ep = entry_point_plugins(group="errbot.backend_plugins")
+        all_plugins_paths = collect_roots((base_search_dir, extra_search_dirs, ep))
 
         for potential_plugin in enumerate_backend_plugins(all_plugins_paths):
             if potential_plugin.name == plugin_name:

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

@@ -11,11 +11,12 @@ log = logging.getLogger(__name__)
 
 class Identifier(ABC):
     """This is just use for type hinting representing the Identifier contract,
+
     NEVER TRY TO SUBCLASS IT OUTSIDE OF A BACKEND, it is just here to show you what you can expect from an Identifier.
     To get an instance of a real identifier, always use the properties from Message (to, from) or self.build_identifier
-     to make an identifier from a String.
+    to make an identifier from a String.
 
-     The semantics is anything you can talk to: Person, Room, RoomOccupant etc.
+    The semantics is anything you can talk to: Person, Room, RoomOccupant etc.
     """
 
     pass
@@ -23,9 +24,10 @@ class Identifier(ABC):
 
 class Person(Identifier):
     """This is just use for type hinting representing the Identifier contract,
+
     NEVER TRY TO SUBCLASS IT OUTSIDE OF A BACKEND, it is just here to show you what you can expect from an Identifier.
     To get an instance of a real identifier, always use the properties from Message (to, from) or self.build_identifier
-     to make an identifier from a String.
+    to make an identifier from a String.
     """
 
     @property
@@ -221,7 +223,7 @@ class Room(Identifier):
         """
         Invite one or more people into the room.
 
-        :*args:
+        :param *args:
             One or more identifiers to invite into the room.
         """
         raise NotImplementedError(
@@ -389,7 +391,7 @@ class Message:
         return self._extras
 
     @property
-    def flow(self) -> "Flow":
+    def flow(self) -> "errbot.Flow":
         """
         Get the conversation flow for this message.
 
@@ -590,7 +592,6 @@ class Reaction:
         reaction_name: str = None,
         reacted_to: Mapping = None,
     ):
-
         if reactor is None:
             raise ValueError("Reaction: reactor is None")
         if reaction_name is None:

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

@@ -315,7 +315,7 @@ class IRCRoom(Room):
         """
         Invite one or more people into the room.
 
-        :*args:
+        :param \*args:
             One or more nicks to invite into the room.
         """
         for nick in args:

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

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

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

@@ -565,12 +565,14 @@ class TestBot:
     def inject_mocks(self, plugin_name: str, mock_dict: dict):
         """Inject mock objects into the plugin
 
-        mock_dict = {
-            'field_1': obj_1,
-            'field_2': obj_2,
-        }
-        testbot.inject_mocks(HelloWorld, mock_dict)
-        assert 'blah' in testbot.exec_command('!hello')
+        Example::
+
+            mock_dict = {
+                'field_1': obj_1,
+                'field_2': obj_2,
+            }
+            testbot.inject_mocks(HelloWorld, mock_dict)
+            assert 'blah' in testbot.exec_command('!hello')
         """
         plugin = self.bot.plugin_manager.get_plugin_obj_by_name(plugin_name)
 

{errbot-6.1.9 → errbot-6.2.0}/errbot/backends/text.py

@@ -282,7 +282,6 @@ class TextBackend(ErrBot):
 
         try:
             while True:
-
                 if self._inroom:
                     frm = TextOccupant(self.user, self.rooms()[0])
                     to = self.rooms()[0]

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import sys
 from datetime import datetime

{errbot-6.1.9 → errbot-6.2.0}/errbot/bootstrap.py

@@ -1,6 +1,7 @@
 import importlib
 import logging
 import sys
+import warnings
 from os import makedirs, path
 from typing import Callable, Optional
 
@@ -131,25 +132,29 @@ def setup_bot(
 
             sentry_integrations.append(FlaskIntegration())
 
-        try:
-            if hasattr(config, "SENTRY_TRANSPORT") and isinstance(
-                config.SENTRY_TRANSPORT, tuple
-            ):
+        sentry_options = getattr(config, "SENTRY_OPTIONS", {})
+        if hasattr(config, "SENTRY_TRANSPORT") and isinstance(
+            config.SENTRY_TRANSPORT, tuple
+        ):
+            warnings.warn(
+                "SENTRY_TRANSPORT is deprecated. Please use SENTRY_OPTIONS instead.",
+                DeprecationWarning,
+            )
+            try:
                 mod = importlib.import_module(config.SENTRY_TRANSPORT[1])
                 transport = getattr(mod, config.SENTRY_TRANSPORT[0])
-
-                sentry_sdk.init(
-                    dsn=config.SENTRY_DSN,
-                    integrations=sentry_integrations,
-                    transport=transport,
+                sentry_options["transport"] = transport
+            except ImportError:
+                log.exception(
+                    f"Unable to import selected SENTRY_TRANSPORT - {config.SENTRY_TRANSPORT}"
                 )
-            else:
-                sentry_sdk.init(dsn=config.SENTRY_DSN, integrations=sentry_integrations)
-        except ImportError:
-            log.exception(
-                f"Unable to import selected SENTRY_TRANSPORT - {config.SENTRY_TRANSPORT}"
-            )
-            exit(-1)
+                exit(-1)
+        # merge options dict with dedicated SENTRY_DSN setting
+        sentry_kwargs = {
+            **sentry_options,
+            **{"dsn": config.SENTRY_DSN, "integrations": sentry_integrations},
+        }
+        sentry_sdk.init(**sentry_kwargs)
 
     logger.setLevel(config.BOT_LOG_LEVEL)
 

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

@@ -134,9 +134,7 @@ class Command:
             update_wrapper(self.definition, args, kwargs)
         else:
             log.warning(
-                "Attempting to append arguments to {} isn't supported.".format(
-                    self.definition
-                )
+                f"Attempting to append arguments to {self.definition} isn't supported."
             )
 
 

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

@@ -27,7 +27,7 @@ from typing import Optional, Union
 from errbot.bootstrap import CORE_BACKENDS
 from errbot.logs import root_logger
 from errbot.plugin_wizard import new_plugin_wizard
-from errbot.utils import collect_roots
+from errbot.utils import collect_roots, entry_point_plugins
 from errbot.version import VERSION
 
 log = logging.getLogger(__name__)
@@ -83,10 +83,10 @@ def get_config(config_path: str):
 
 
 def _read_dict() -> dict:
-    import collections
+    from collections.abc import Mapping
 
     new_dict = ast.literal_eval(sys.stdin.read())
-    if not isinstance(new_dict, collections.Mapping):
+    if not isinstance(new_dict, Mapping):
         raise ValueError(
             f"A dictionary written in python is needed from stdin. "
             f"Type={type(new_dict)}, Value = {repr(new_dict)}."
@@ -95,7 +95,6 @@ def _read_dict() -> dict:
 
 
 def main() -> None:
-
     execution_dir = getcwd()
 
     # By default insert the execution path (useful to be able to execute Errbot from
@@ -209,6 +208,7 @@ def main() -> None:
 
             data_dir = base_dir / "data"
             extra_plugin_dir = base_dir / "plugins"
+            extra_backend_plugin_dir = base_dir / "backend-plugins"
             example_plugin_dir = extra_plugin_dir / "err-example"
             log_path = base_dir / "errbot.log"
 
@@ -220,6 +220,7 @@ def main() -> None:
 
             data_dir.mkdir(exist_ok=True)
             extra_plugin_dir.mkdir(exist_ok=True)
+            extra_backend_plugin_dir.mkdir(exist_ok=True)
             example_plugin_dir.mkdir(exist_ok=True)
 
             with open(base_dir / "config.py", "w") as f:
@@ -227,6 +228,7 @@ def main() -> None:
                     config_template.render(
                         data_dir=str(data_dir),
                         extra_plugin_dir=str(extra_plugin_dir),
+                        extra_backend_plugin_dir=str(extra_backend_plugin_dir),
                         log_path=str(log_path),
                     )
                 )
@@ -281,6 +283,8 @@ def main() -> None:
     extra_backend = getattr(config, "BOT_EXTRA_BACKEND_DIR", [])
     if isinstance(extra_backend, str):
         extra_backend = [extra_backend]
+    ep = entry_point_plugins(group="errbot.backend_plugins")
+    extra_backend.extend(ep)
 
     if args["list"]:
         from errbot.backend_plugin_manager import enumerate_backend_plugins