errbot 6.1.8__tar.gz → 6.2.0__tar.gz

{errbot-6.1.8 → 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.8 → 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.8 → 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.8 → errbot-6.2.0}/CHANGES.rst

@@ -1,3 +1,91 @@
+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)
+-------------------
+
+features:
+
+- core: set default backend to Text (#1522)
+- core: option to divert all commands to private or thread (#1528)
+- core: add type hints to core and backend functions (#1542)
+- docs: add ACL and numerous backends to official documentation (#1552)
+- core: add Python 3.10 to automated tests (#1539)
+- core: add room acl attribute (#1530)
+- chore: refactor Dockerfile errbot install and python version bump (#1571)
+
+fixes:
+
+- core: success handling for update_repos (#1520)
+- core/plugins: cascade dependency plugins (#1519)
+- core/plugins: reload all repo plugins when updating a repo (#1521)
+- plugin_manager: correct syntax error (#1524)
+- backend/text: add stub send_stream_request method (#1527)
+- backend/hipchat: remove HipChat backend (#1525)
+- backend/test: shutdown sequence to address test failure (#1535)
+- core: various minor logging improvements (#1536)
+- chore: various minor formatting improvements (#1541)
+- docs: update spark plugin reference (#1546)
+- fix: python 2 version references in docs and init template (#1543)
+- backends: deprecate built-in Slack and SlackRTM (#1526)
+- chore: remove python 3.6 checks and test environment (#1540)
+- chore: add/update issue templates (#1554)
+- chore: pin all package dependencies (#1553, #1559)
+- core/webserver: use errbot loglevel for consistent logging. (#1556)
+- fix/core: prevent infinite loop when only BOT_PREFIX is passed (#1557)
+- chore: bump actions/setup-python from 2 to 3.1.0 (#1563)
+- chore: Set permissions for GitHub actions (#1565)
+- fix: removed deprecated argument reconnection_interval for irc v20.0 (#1568)
+- docs: Add Gentoo packages (#1567)
+- chore: bump actions/setup-python from 3.1.0 to 3.1.2 (#1564)
+- fix: circular dependencies error when there are none (#1505)
+
 v6.1.8 (2021-06-21)
 -------------------
 
@@ -13,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.8/errbot.egg-info → errbot-6.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: errbot
-Version: 6.1.8
+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,18 +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.6
-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: hipchat
-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
@@ -72,17 +93,15 @@ Chat servers support
 **Built-in**
 
 - IRC support
-- `Hipchat support <http://www.hipchat.com/>`_
-- `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>`__)
-- `Cisco Spark <https://www.ciscospark.com/>`_ (See `instructions <https://github.com/marksull/err-backend-cisco-spark>`__)
-- `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>`__)
@@ -110,14 +129,14 @@ 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
 - subcommands and various arg parsing options are available (re, command line type)
 - polling support: your can setup a plugin to periodically do something
 - end to end test backend
-- card rendering under Slack and Hipchat.
+- card rendering under Slack
 
 Community and support
 ---------------------
@@ -161,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, hipchat, 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
 ~~~~~~~~~~~~~
@@ -258,6 +277,94 @@ 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)
+-------------------
+
+features:
+
+- core: set default backend to Text (#1522)
+- core: option to divert all commands to private or thread (#1528)
+- core: add type hints to core and backend functions (#1542)
+- docs: add ACL and numerous backends to official documentation (#1552)
+- core: add Python 3.10 to automated tests (#1539)
+- core: add room acl attribute (#1530)
+- chore: refactor Dockerfile errbot install and python version bump (#1571)
+
+fixes:
+
+- core: success handling for update_repos (#1520)
+- core/plugins: cascade dependency plugins (#1519)
+- core/plugins: reload all repo plugins when updating a repo (#1521)
+- plugin_manager: correct syntax error (#1524)
+- backend/text: add stub send_stream_request method (#1527)
+- backend/hipchat: remove HipChat backend (#1525)
+- backend/test: shutdown sequence to address test failure (#1535)
+- core: various minor logging improvements (#1536)
+- chore: various minor formatting improvements (#1541)
+- docs: update spark plugin reference (#1546)
+- fix: python 2 version references in docs and init template (#1543)
+- backends: deprecate built-in Slack and SlackRTM (#1526)
+- chore: remove python 3.6 checks and test environment (#1540)
+- chore: add/update issue templates (#1554)
+- chore: pin all package dependencies (#1553, #1559)
+- core/webserver: use errbot loglevel for consistent logging. (#1556)
+- fix/core: prevent infinite loop when only BOT_PREFIX is passed (#1557)
+- chore: bump actions/setup-python from 2 to 3.1.0 (#1563)
+- chore: Set permissions for GitHub actions (#1565)
+- fix: removed deprecated argument reconnection_interval for irc v20.0 (#1568)
+- docs: Add Gentoo packages (#1567)
+- chore: bump actions/setup-python from 3.1.0 to 3.1.2 (#1564)
+- fix: circular dependencies error when there are none (#1505)
+
 v6.1.8 (2021-06-21)
 -------------------
 
@@ -273,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)
@@ -481,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.8 → errbot-6.2.0}/README.rst

@@ -43,17 +43,15 @@ Chat servers support
 **Built-in**
 
 - IRC support
-- `Hipchat support <http://www.hipchat.com/>`_
-- `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>`__)
-- `Cisco Spark <https://www.ciscospark.com/>`_ (See `instructions <https://github.com/marksull/err-backend-cisco-spark>`__)
-- `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>`__)
@@ -81,14 +79,14 @@ 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
 - subcommands and various arg parsing options are available (re, command line type)
 - polling support: your can setup a plugin to periodically do something
 - end to end test backend
-- card rendering under Slack and Hipchat.
+- card rendering under Slack
 
 Community and support
 ---------------------
@@ -132,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, hipchat, 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.8 → errbot-6.2.0}/errbot/__init__.py

@@ -5,7 +5,7 @@ import re
 import shlex
 import sys
 from functools import wraps
-from typing import Any, Callable, Tuple
+from typing import Any, Callable, List, Optional, Tuple
 
 from .backends.base import AWAY, DND, OFFLINE, ONLINE, Message  # noqa
 from .botplugin import (  # noqa
@@ -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(
@@ -458,8 +455,14 @@ def update_wrapper(wrapper, argparse_args, kwargs):
     ]
 
 
-def _tag_webhook(func, uri_rule, methods, form_param, raw):
-    log.info(f"webhooks:  Flag to bind {uri_rule} to {getattr(func, '__name__', func)}")
+def _tag_webhook(
+    func: Callable,
+    uri_rule: str,
+    methods: Tuple[str],
+    form_param: Optional[str],
+    raw: bool,
+) -> Callable:
+    log.info(f"webhooks: Flag to bind {uri_rule} to {getattr(func, '__name__', func)}")
     func._err_webhook_uri_rule = uri_rule
     func._err_webhook_methods = methods
     func._err_webhook_form_param = form_param
@@ -467,7 +470,7 @@ def _tag_webhook(func, uri_rule, methods, form_param, raw):
     return func
 
 
-def _uri_from_func(func):
+def _uri_from_func(func: Callable) -> str:
     return r"/" + func.__name__
 
 

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

@@ -1,11 +1,11 @@
 import logging
 import sys
 from pathlib import Path
-from typing import Any, Type
+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__)
 
@@ -14,7 +14,9 @@ class PluginNotFoundException(Exception):
     pass
 
 
-def enumerate_backend_plugins(all_plugins_paths):
+def enumerate_backend_plugins(
+    all_plugins_paths: List[Union[str, Path]]
+) -> Iterator[PluginInfo]:
     plugin_places = [Path(root) for root in all_plugins_paths]
     for path in plugin_places:
         plugfiles = path.glob("**/*.plug")
@@ -42,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: