Skip to content

Commit dd66db5

Browse files
authored
chore: update all dependencies (#1754)
* chore: update all dependencies * docs: add info to CHANGES * fix: update dependencies after dropping py3.9 support * test: add docker build test * refactor: modernize docker build and push * test: add a docker image smoke test * test: include arm64 build too
1 parent 08359b0 commit dd66db5

4 files changed

Lines changed: 79 additions & 27 deletions

File tree

.github/workflows/docker-build.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,27 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- name: checkout
18-
uses: actions/checkout@v6.0.2
19-
20-
- name: build and push docker image
21-
uses: mr-smithers-excellent/docker-build-push@v6
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 }}
17+
- name: Checkout
18+
uses: actions/checkout@v6.0.2
19+
20+
- name: Set up QEMU
21+
uses: docker/setup-qemu-action@v3
22+
23+
- name: Set up Docker Buildx
24+
uses: docker/setup-buildx-action@v3
25+
26+
- name: Login to Docker Hub
27+
uses: docker/login-action@v3
28+
with:
29+
username: ${{ secrets.DOCKER_USERNAME }}
30+
password: ${{ secrets.DOCKER_PASSWORD }}
31+
32+
- name: Build and push
33+
uses: docker/build-push-action@v6
34+
with:
35+
context: .
36+
platforms: linux/amd64,linux/arm64
37+
push: true
38+
tags: errbotio/errbot:latest
39+
cache-from: type=gha
40+
cache-to: type=gha,mode=max

.github/workflows/python-package.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,40 @@ jobs:
5959
if: ${{ matrix.python-version == '3.12' }}
6060
run: |
6161
tox -e docs
62+
63+
docker:
64+
runs-on: ubuntu-latest
65+
steps:
66+
- name: Checkout
67+
uses: actions/checkout@v6.0.2
68+
69+
- name: Set up QEMU
70+
uses: docker/setup-qemu-action@v3
71+
72+
- name: Set up Docker Buildx
73+
uses: docker/setup-buildx-action@v3
74+
75+
- name: Build (Multi-platform validation)
76+
uses: docker/build-push-action@v6
77+
with:
78+
context: .
79+
platforms: linux/amd64,linux/arm64
80+
push: false
81+
cache-from: type=gha
82+
cache-to: type=gha,mode=max
83+
84+
- name: Build (Native load for smoke test)
85+
uses: docker/build-push-action@v6
86+
with:
87+
context: .
88+
load: true
89+
tags: errbot-test:latest
90+
cache-from: type=gha
91+
cache-to: type=gha,mode=max
92+
93+
- name: Smoke test image
94+
run: |
95+
docker run --rm errbot-test:latest --version
96+
docker run --rm errbot-test:latest --help
97+
98+

CHANGES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ fixes:
3737
- fix: add command in logged when blocked by cmdfilter (#1631)
3838
- chore: bump pyasn1 version (#1752)
3939
- chore: remove python 3.9 support (#1755)
40+
- chore: bump all dependencies (#1754)
4041

4142

4243
v6.2.0 (2024-01-01)

setup.py

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@
2727
VERSION_FILE = os.path.join("errbot", "version.py")
2828

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

4646
src_root = os.curdir
@@ -113,21 +113,23 @@ def read(fname, encoding="ascii"):
113113
"errbot-backend-slackv3==0.3.2",
114114
],
115115
"discord": [
116+
# held at 3.0.1: 4.0 is a major bump on external backend; compat unverified
116117
"err-backend-discord==3.0.1",
117118
],
118119
"mattermost": [
119120
"err-backend-mattermost==3.0.0",
120121
],
121122
"IRC": [
122-
"irc==20.3.0",
123+
"irc==20.5.0",
123124
],
124125
"telegram": [
126+
# held at 13.15: v20+ is fully async; backend would need a rewrite
125127
"python-telegram-bot==13.15",
126128
],
127129
"XMPP": [
128-
"slixmpp==1.8.4",
130+
"slixmpp==1.15.0",
129131
"pyasn1==0.6.3",
130-
"pyasn1-modules==0.3.0",
132+
"pyasn1-modules==0.4.2",
131133
],
132134
':sys_platform!="win32"': ["daemonize==2.5.0"],
133135
},

0 commit comments

Comments
 (0)