From 3660c4333077216c257e34e7892dc51c4e033356 Mon Sep 17 00:00:00 2001 From: Sijis Aviles Date: Fri, 1 May 2026 02:10:10 -0500 Subject: [PATCH 1/7] chore: update all dependencies --- setup.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py index 1bfdc8266..dd8c3d075 100644 --- a/setup.py +++ b/setup.py @@ -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.9", # 3.10+ drops Python 3.9 + "ansi==0.3.7", + "Pygments==2.20.0", + "pygments-markdown-lexer==0.1.0.dev39", # syntax coloring to debug md + "dulwich==0.24.10", # python implementation of git; 1.0+ drops Python 3.9 + "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 @@ -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.12.0", # 1.13+ drops Python 3.9 "pyasn1==0.6.3", - "pyasn1-modules==0.3.0", + "pyasn1-modules==0.4.2", ], ':sys_platform!="win32"': ["daemonize==2.5.0"], }, From 5b0e983df174b98df6fe96679a6ae1186a567465 Mon Sep 17 00:00:00 2001 From: Sijis Aviles Date: Fri, 1 May 2026 02:11:57 -0500 Subject: [PATCH 2/7] docs: add info to CHANGES --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index d6a6e0a19..04ce4ccf7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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) From 7035db7c6e4ca400c654bf4ccc1ddd3dafce6974 Mon Sep 17 00:00:00 2001 From: Sijis Aviles Date: Thu, 7 May 2026 23:13:48 -0500 Subject: [PATCH 3/7] fix: update dependencies after dropping py3.9 support --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index dd8c3d075..33590ca6e 100644 --- a/setup.py +++ b/setup.py @@ -34,11 +34,11 @@ "jinja2==3.1.6", "pyOpenSSL==26.1.0", "colorlog==6.10.1", - "markdown==3.9", # 3.10+ drops Python 3.9 + "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==0.24.10", # python implementation of git; 1.0+ drops Python 3.9 + "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 ] @@ -127,7 +127,7 @@ def read(fname, encoding="ascii"): "python-telegram-bot==13.15", ], "XMPP": [ - "slixmpp==1.12.0", # 1.13+ drops Python 3.9 + "slixmpp==1.15.0", "pyasn1==0.6.3", "pyasn1-modules==0.4.2", ], From bca2df9e2d11769ba239311c12696ae31be73610 Mon Sep 17 00:00:00 2001 From: Sijis Aviles Date: Fri, 8 May 2026 00:10:27 -0500 Subject: [PATCH 4/7] test: add docker build test --- .github/workflows/python-package.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index a24c85997..03ebc3c4d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -59,3 +59,11 @@ jobs: if: ${{ matrix.python-version == '3.12' }} run: | tox -e docs + + docker: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6.0.2 + - name: Build Docker image + run: | + docker build . --file Dockerfile --tag errbot-test:latest From 32f970ebe58080c490414af4a78ba96055173f81 Mon Sep 17 00:00:00 2001 From: Sijis Aviles Date: Fri, 8 May 2026 00:19:31 -0500 Subject: [PATCH 5/7] refactor: modernize docker build and push --- .github/workflows/docker-build.yml | 36 ++++++++++++++++++---------- .github/workflows/python-package.yml | 18 ++++++++++---- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index befe9e4d8..449d3e4b1 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -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 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 03ebc3c4d..2162d18c1 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -63,7 +63,17 @@ jobs: docker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6.0.2 - - name: Build Docker image - run: | - docker build . --file Dockerfile --tag errbot-test:latest + - name: Checkout + uses: actions/checkout@v6.0.2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build (Validation) + uses: docker/build-push-action@v6 + with: + context: . + push: false + tags: errbot-test:latest + cache-from: type=gha + cache-to: type=gha,mode=max From adfe7981b58dc6a468416e94ede98d6465ebd6c1 Mon Sep 17 00:00:00 2001 From: Sijis Aviles Date: Fri, 8 May 2026 00:34:01 -0500 Subject: [PATCH 6/7] test: add a docker image smoke test --- .github/workflows/python-package.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 2162d18c1..c16ad159b 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -73,7 +73,13 @@ jobs: uses: docker/build-push-action@v6 with: context: . - push: false + 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 + From fa68a030cb376f59e36101e41579abbc9f9a51ed Mon Sep 17 00:00:00 2001 From: Sijis Aviles Date: Fri, 8 May 2026 00:40:56 -0500 Subject: [PATCH 7/7] test: include arm64 build too --- .github/workflows/python-package.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index c16ad159b..5d6ef71b8 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -66,10 +66,22 @@ jobs: - 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 (Validation) + - 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: . @@ -83,3 +95,4 @@ jobs: docker run --rm errbot-test:latest --version docker run --rm errbot-test:latest --help +