Skip to content

Commit 1743b18

Browse files
authored
Merge pull request #1 from errbotio/master
Update to the latest version
2 parents 80d438f + b1a6408 commit 1743b18

File tree

102 files changed

+1804
-4640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1804
-4640
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: 'type: bug'
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Provide steps to reproduce the behavior or include sample plugin code.
15+
16+
**Expected behavior**
17+
A clear and concise description of what you expected to happen.
18+
19+
**Screenshots**
20+
If applicable, add screenshots to help explain your problem.
21+
22+
**Environment (please complete the following information):**
23+
- Errbot version:
24+
- OS version:
25+
- Python version:
26+
- Using a virtual environment: yes/no
27+
- Using Docker: yes/no
28+
29+
**Additional context**
30+
Add any other context about the problem here.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: 'type: feature'
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Is feature related to**
17+
18+
- [ ] Backend support
19+
- [ ] Plugins (storage, flows)
20+
- [ ] Functionality
21+
- [ ] Other
22+
23+
**Additional context**
24+
Add any other context or screenshots about the feature request here.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Support - Running bot or plugins
3+
about: Requesting help with running errbot
4+
title: ''
5+
labels: 'type: support/question'
6+
assignees: ''
7+
8+
---
9+
10+
**Need help with**
11+
12+
- [ ] Running the bot
13+
- [ ] Writing plugin
14+
- [ ] Other
15+
16+
**Issue description**
17+
Please describe the issue. The more information you can provide, the better.
18+
19+
**Steps to reproduce**
20+
Provide steps to reproduce the behavior or include sample plugin code.
21+
22+
**Environment (please complete the following information):**
23+
- Errbot version:
24+
- OS version:
25+
- Python version:
26+
- Using a virtual environment: yes/no
27+
- Using Docker: yes/no
28+
29+
30+
**Additional info**
31+
If you have any more information, please specify it here.

.github/workflows/docker-build.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: build docker image
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
build:
13+
if: github.repository_owner == 'errbotio'
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: checkout
18+
uses: actions/checkout@v2
19+
20+
- name: build and push docker image
21+
uses: mr-smithers-excellent/docker-build-push@v5
22+
with:
23+
image: errbotio/errbot
24+
tags: latest
25+
registry: docker.io
26+
dockerfile: Dockerfile
27+
username: ${{ secrets.DOCKER_USERNAME }}
28+
password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/python-package.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,22 @@ on:
99
pull_request:
1010
branches: [ master ]
1111

12+
permissions:
13+
contents: read
14+
1215
jobs:
1316
build:
1417

1518
runs-on: ubuntu-latest
1619
strategy:
1720
fail-fast: false
1821
matrix:
19-
python-version: [3.6, 3.7, 3.8, 3.9]
22+
python-version: [3.7, 3.8, 3.9, "3.10"]
2023

2124
steps:
2225
- uses: actions/checkout@v2
2326
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v2
27+
uses: actions/setup-python@v4.0.0
2528
with:
2629
python-version: ${{ matrix.python-version }}
2730

@@ -38,21 +41,26 @@ jobs:
3841
tox -e py
3942
4043
- name: Check Distribution
41-
if: ${{ matrix.python-version == '3.8' }}
44+
if: ${{ matrix.python-version == '3.9' }}
4245
run: |
4346
tox -e dist-check
4447
4548
- name: Codestyle
46-
if: ${{ matrix.python-version == '3.8' }}
49+
if: ${{ matrix.python-version == '3.9' }}
4750
run: |
4851
tox -e codestyle
4952
5053
- name: Lint - sort
51-
if: ${{ matrix.python-version == '3.8' }}
54+
if: ${{ matrix.python-version == '3.9' }}
5255
run: |
5356
tox -e sort
5457
5558
- name: Security
56-
if: ${{ matrix.python-version == '3.8' }}
59+
if: ${{ matrix.python-version == '3.9' }}
5760
run: |
5861
tox -e security
62+
63+
- name: Docs
64+
if: ${{ matrix.python-version == '3.9' }}
65+
run: |
66+
tox -e docs

CHANGES.rst

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,68 @@
1-
v6.1.8 (unreleased)
1+
v9.9.9 (unreleased)
2+
-------------------
3+
4+
breaking:
5+
6+
- backend/slack: remove slack and slack_rtm built-in backends (#1581)
7+
8+
features:
9+
10+
- core/plugins: detect plugins using entrypoints (#1590)
11+
12+
fixes:
13+
14+
- docs: add unreleased section (#1576)
15+
- docs: update broken URL for Markdown Extra (#1572)
16+
- chore: bump actions/setup-python version (#1575)
17+
- backend/telegram: fix missing imports (#1574)
18+
- chore: ci improvements (#1577, #1583)
19+
- chore: add docs build to ci (#1582)
20+
- backend/xmpp: fix forward type references (#1578)
21+
- chore: remove campfire references (#1584)
22+
- chore/setup: fix exception when installing on python <3.7 (#1585)
23+
- docs: typos (#1589)
24+
25+
26+
v6.1.9 (2022-06-11)
27+
-------------------
28+
29+
features:
30+
31+
- core: set default backend to Text (#1522)
32+
- core: option to divert all commands to private or thread (#1528)
33+
- core: add type hints to core and backend functions (#1542)
34+
- docs: add ACL and numerous backends to official documentation (#1552)
35+
- core: add Python 3.10 to automated tests (#1539)
36+
- core: add room acl attribute (#1530)
37+
- chore: refactor Dockerfile errbot install and python version bump (#1571)
38+
39+
fixes:
40+
41+
- core: success handling for update_repos (#1520)
42+
- core/plugins: cascade dependency plugins (#1519)
43+
- core/plugins: reload all repo plugins when updating a repo (#1521)
44+
- plugin_manager: correct syntax error (#1524)
45+
- backend/text: add stub send_stream_request method (#1527)
46+
- backend/hipchat: remove HipChat backend (#1525)
47+
- backend/test: shutdown sequence to address test failure (#1535)
48+
- core: various minor logging improvements (#1536)
49+
- chore: various minor formatting improvements (#1541)
50+
- docs: update spark plugin reference (#1546)
51+
- fix: python 2 version references in docs and init template (#1543)
52+
- backends: deprecate built-in Slack and SlackRTM (#1526)
53+
- chore: remove python 3.6 checks and test environment (#1540)
54+
- chore: add/update issue templates (#1554)
55+
- chore: pin all package dependencies (#1553, #1559)
56+
- core/webserver: use errbot loglevel for consistent logging. (#1556)
57+
- fix/core: prevent infinite loop when only BOT_PREFIX is passed (#1557)
58+
- chore: bump actions/setup-python from 2 to 3.1.0 (#1563)
59+
- chore: Set permissions for GitHub actions (#1565)
60+
- fix: removed deprecated argument reconnection_interval for irc v20.0 (#1568)
61+
- docs: Add Gentoo packages (#1567)
62+
- chore: bump actions/setup-python from 3.1.0 to 3.1.2 (#1564)
63+
- fix: circular dependencies error when there are none (#1505)
64+
65+
v6.1.8 (2021-06-21)
266
-------------------
367

468
features:

Dockerfile

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1-
FROM python:3.8-slim as BUILD
1+
FROM python:3.9-slim as build
22
WORKDIR /wheel
33
COPY . .
4-
RUN pip3 wheel --wheel-dir=/wheel \
5-
errbot errbot[irc] errbot[slack] errbot[XMPP] errbot[telegram]
4+
RUN apt update && apt install -y build-essential git
5+
RUN cd /tmp && \
6+
git clone https://github.com/errbotio/err-backend-slackv3 slackv3
7+
RUN pip3 wheel --wheel-dir=/wheel . \
8+
-r /tmp/slackv3/requirements.txt wheel \
9+
errbot errbot[irc] errbot[XMPP] errbot[telegram] && \
10+
cp /tmp/slackv3/requirements.txt /wheel/slackv3-requirements.txt
611

7-
FROM python:3.8-slim
8-
COPY --from=BUILD /wheel /wheel
12+
FROM python:3.9-slim as base
13+
COPY --from=build /wheel /wheel
914
RUN apt update && \
1015
apt install -y git && \
1116
cd /wheel && \
12-
pip3 -vv install --no-cache-dir --no-index --find-links /wheel \
13-
errbot errbot[irc] errbot[slack] errbot[XMPP] errbot[telegram] && \
17+
pip3 -vv install --no-cache-dir --no-index --find-links /wheel . \
18+
-r /wheel/slackv3-requirements.txt \
19+
errbot errbot[irc] errbot[XMPP] errbot[telegram] && \
1420
rm -rf /wheel /var/lib/apt/lists/*
15-
1621
RUN useradd -m errbot
17-
USER errbot
22+
23+
FROM base
1824
EXPOSE 3141 3142
1925
VOLUME /home/errbot
2026
WORKDIR /home/errbot
27+
USER errbot
28+
RUN errbot --init
29+
RUN git clone https://github.com/errbotio/err-backend-slackv3 backend-plugins/slackv3
2130
ENTRYPOINT [ "/usr/local/bin/errbot" ]

README.rst

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,15 @@ Chat servers support
4343
**Built-in**
4444

4545
- IRC support
46-
- `Hipchat support <http://www.hipchat.com/>`_
47-
- `Slack support <https://slack.com/>`_
4846
- `Telegram support <https://www.telegram.org/>`_
4947
- `XMPP support <http://xmpp.org>`_
5048

5149
**With add-ons**
5250

53-
- `CampFire <https://campfirenow.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-campfire>`__)
54-
- `Cisco Spark <https://www.ciscospark.com/>`_ (See `instructions <https://github.com/marksull/err-backend-cisco-spark>`__)
55-
- `Discord <https://www.discordapp.com/>`_ (See `instructions <https://github.com/gbin/err-backend-discord>`__)
51+
- `Slack support <https://slack.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-slackv3>`__)
52+
- `Discord <https://www.discordapp.com/>`_ (See `instructions <https://github.com/errbotio/err-backend-discord>`__)
5653
- `Gitter support <https://gitter.im/>`_ (See `instructions <https://github.com/errbotio/err-backend-gitter>`__)
54+
- `Webex <https://www.webex.com/>`_ (See `instructions <https://github.com/marksull/err-backend-cisco-webex-teams>`__)
5755
- `Mattermost <https://about.mattermost.com/>`_ (See `instructions <https://github.com/Vaelor/errbot-mattermost-backend>`__)
5856
- `RocketChat <https://rocket.chat/>`_ (See `instructions <https://github.com/cardoso/errbot-rocketchat>`__)
5957
- `Skype <https://www.skype.com/>`_ (See `instructions <https://github.com/errbotio/errbot-backend-skype>`__)
@@ -81,14 +79,14 @@ Developer features
8179
- Presetup storage for every plugin i.e. ``self['foo'] = 'bar'`` persists the value.
8280
- Conversation flows to track conversation states from users.
8381
- Webhook callbacks support
84-
- supports `markdown extras <https://pythonhosted.org/Markdown/extensions/extra.html>`_ formatting with tables, embedded images, links etc.
82+
- supports `markdown extras <https://markdown-extra.readthedocs.io/>`_ formatting with tables, embedded images, links etc.
8583
- configuration helper to allow your plugin to be configured by chat
8684
- Text development/debug consoles
8785
- Self-documenting: your docstrings become help automatically
8886
- subcommands and various arg parsing options are available (re, command line type)
8987
- polling support: your can setup a plugin to periodically do something
9088
- end to end test backend
91-
- card rendering under Slack and Hipchat.
89+
- card rendering under Slack
9290

9391
Community and support
9492
---------------------
@@ -132,12 +130,12 @@ It will show you a prompt `>>>` so you can talk to your bot directly! Try `!help
132130
Adding support for a chat system
133131
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
134132

135-
For the built-ins, just use one of those options `slack, hipchat, telegram, IRC, XMPP` with pip, you can still do it
133+
For the built-ins, just use one of those options `telegram, IRC, XMPP` with pip, you can still do it
136134
after the initial installation to add the missing support for example ::
137135

138-
$ pip install "errbot[slack]"
136+
$ pip install "errbot[irc]"
139137

140-
For the external ones (Skype, Gitter, Discord etc ...), please follow their respective github pages for instructions.
138+
For the external ones (Slack, Discord, Gitter, Skype, etc ...), please follow their respective github pages for instructions.
141139

142140
Configuration
143141
~~~~~~~~~~~~~

docs/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Publishing to Read the Docs
3232
Read the Docs should rebuild the site automatically when new commits are pushed.
3333
When new project releases are made, it may be necessary to add the new version
3434
and remove older versions (to prevent clutter in the version drop-down).
35-
This can be done at https://readthedocs.org/dashboard/errbot/versions/.
35+
This can be done at https://readthedocs.org/projects/errbot/versions/.
3636

3737

3838
.. _Sphinx: http://sphinx-doc.org/

0 commit comments

Comments
 (0)