Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,27 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: checkout
uses: actions/checkout@v6.0.2

- name: build and push docker image
uses: mr-smithers-excellent/docker-build-push@v6
with:
image: errbotio/errbot
tags: latest
registry: docker.io
dockerfile: Dockerfile
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Checkout
uses: actions/checkout@v6.0.2

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: errbotio/errbot:latest
cache-from: type=gha
cache-to: type=gha,mode=max
37 changes: 37 additions & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,40 @@ jobs:
if: ${{ matrix.python-version == '3.12' }}
run: |
tox -e docs

docker:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6.0.2

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build (Multi-platform validation)
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64,linux/arm64
push: false
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build (Native load for smoke test)
uses: docker/build-push-action@v6
with:
context: .
load: true
tags: errbot-test:latest
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Smoke test image
run: |
docker run --rm errbot-test:latest --version
docker run --rm errbot-test:latest --help


1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ fixes:
- 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)


v6.2.0 (2024-01-01)
Expand Down
32 changes: 17 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@
VERSION_FILE = os.path.join("errbot", "version.py")

deps = [
"webtest==3.0.0",
"webtest==3.0.7",
"setuptools>=78.1.1",
"flask==2.3.3",
"requests==2.32.3",
"flask==3.1.3",
"requests==2.32.5",
"jinja2==3.1.6",
"pyOpenSSL==24.3.0",
"colorlog==6.7.0",
"markdown==3.4.4",
"ansi==0.3.6",
"Pygments==2.16.1",
"pygments-markdown-lexer==0.1.0.dev39", # sytax coloring to debug md
"dulwich==0.21.5", # python implementation of git
"deepmerge==1.1.0",
"legacy-cgi==2.6.3; python_version >= '3.13'", # stopgap fix for webtest after cgi dropped from stdlib in 3.13
"pyOpenSSL==26.1.0",
"colorlog==6.10.1",
"markdown==3.10.2",
"ansi==0.3.7",
"Pygments==2.20.0",
"pygments-markdown-lexer==0.1.0.dev39", # syntax coloring to debug md
"dulwich==1.2.1", # python implementation of git
"deepmerge==2.0",
"legacy-cgi==2.6.4; python_version >= '3.13'", # stopgap fix for webtest after cgi dropped from stdlib in 3.13
]

src_root = os.curdir
Expand Down Expand Up @@ -113,21 +113,23 @@ def read(fname, encoding="ascii"):
"errbot-backend-slackv3==0.3.2",
],
"discord": [
# held at 3.0.1: 4.0 is a major bump on external backend; compat unverified
"err-backend-discord==3.0.1",
],
"mattermost": [
"err-backend-mattermost==3.0.0",
],
"IRC": [
"irc==20.3.0",
"irc==20.5.0",
],
"telegram": [
# held at 13.15: v20+ is fully async; backend would need a rewrite
"python-telegram-bot==13.15",
],
"XMPP": [
"slixmpp==1.8.4",
"slixmpp==1.15.0",
"pyasn1==0.6.3",
"pyasn1-modules==0.3.0",
"pyasn1-modules==0.4.2",
],
':sys_platform!="win32"': ["daemonize==2.5.0"],
},
Expand Down
Loading