Skip to content

Commit d5eb287

Browse files
chore(deps): bump python, gosu, and Django (#69626)
- bump python to 3.11.8 to resolve security vulnerabilities - bump gosu to 1.17 to resolve security vulnerabilities - bump Django to 5.0.4 - bump self-hosted docker image to _bookworm_ (Debian 12) We [previously tried bumping to Python 3.11.9](#69468), but ran into an odd unicode decoding error in getsentry/getsentry#13760 within our tests. See python/cpython#76511. Python 3.11.8 works. --------- Co-authored-by: getsantry[bot] <66042841+getsantry[bot]@users.noreply.github.com>
1 parent 66492e5 commit d5eb287

10 files changed

+34
-34
lines changed

.github/actions/setup-sentry/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ inputs:
3838
python-version:
3939
description: 'python version to install'
4040
required: false
41-
default: '3.11.6'
41+
default: '3.11.8'
4242
pg-version:
4343
description: 'PostgreSQL version to use'
4444
default: '14'

.github/workflows/backend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
211211
- uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0
212212
with:
213-
python-version: 3.11.6
213+
python-version: 3.11.8
214214
cache-dependency-path: requirements-dev-frozen.txt
215215
install-cmd: python3 -m tools.hack_pip && pip install -q --constraint requirements-dev-frozen.txt pip-tools
216216
- name: check requirements
@@ -306,7 +306,7 @@ jobs:
306306

307307
- uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0
308308
with:
309-
python-version: 3.11.6
309+
python-version: 3.11.8
310310
cache-dependency-path: requirements-dev-frozen.txt
311311
install-cmd: python3 -m tools.hack_pip && pip install -r requirements-dev-frozen.txt
312312

.github/workflows/development-environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3434
- uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0
3535
with:
36-
python-version: 3.11.6
36+
python-version: 3.11.8
3737
cache-dependency-path: |
3838
requirements-dev.txt
3939
requirements-dev-frozen.txt
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5252
- uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0
5353
with:
54-
python-version: 3.11.6
54+
python-version: 3.11.8
5555
cache-dependency-path: |
5656
requirements-dev.txt
5757
requirements-dev-frozen.txt

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0
5757
with:
58-
python-version: 3.11.6
58+
python-version: 3.11.8
5959
cache-dependency-path: |
6060
requirements-dev.txt
6161
requirements-dev-frozen.txt

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.11.6
1+
3.11.8

devenv/config.ini

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[venv.sentry]
2-
python = 3.11.6
2+
python = 3.11.8
33
path = .venv
44
requirements = requirements-dev.txt
55
editable =
@@ -8,7 +8,7 @@ editable =
88
# bins =
99

1010
[venv.getsentry]
11-
python = 3.11.6
11+
python = 3.11.8
1212
# technically these are conflicting paths but getsentry is special
1313
# and would rather keep devenv config symlinked
1414
path = .venv
@@ -17,15 +17,15 @@ editable = .
1717
# but we'll just install it during sync as it's rarely populated
1818
requirements = sentry-requirements-dev-frozen.txt
1919

20-
[python3.11.6]
21-
darwin_x86_64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-apple-darwin-install_only.tar.gz
22-
darwin_x86_64_sha256 = 178cb1716c2abc25cb56ae915096c1a083e60abeba57af001996e8bc6ce1a371
23-
darwin_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-apple-darwin-install_only.tar.gz
24-
darwin_arm64_sha256 = 916c35125b5d8323a21526d7a9154ca626453f63d0878e95b9f613a95006c990
25-
linux_x86_64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-unknown-linux-gnu-install_only.tar.gz
26-
linux_x86_64_sha256 = ee37a7eae6e80148c7e3abc56e48a397c1664f044920463ad0df0fc706eacea8
27-
linux_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-unknown-linux-gnu-install_only.tar.gz
28-
linux_arm64_sha256 = 3e26a672df17708c4dc928475a5974c3fb3a34a9b45c65fb4bd1e50504cc84ec
20+
[python3.11.8]
21+
darwin_x86_64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-x86_64-apple-darwin-install_only.tar.gz
22+
darwin_x86_64_sha256 = 097f467b0c36706bfec13f199a2eaf924e668f70c6e2bd1f1366806962f7e86e
23+
darwin_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-aarch64-apple-darwin-install_only.tar.gz
24+
darwin_arm64_sha256 = 389a51139f5abe071a0d70091ca5df3e7a3dfcfcbe3e0ba6ad85fb4c5638421e
25+
linux_x86_64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-x86_64-unknown-linux-gnu-install_only.tar.gz
26+
linux_x86_64_sha256 = 94e13d0e5ad417035b80580f3e893a72e094b0900d5d64e7e34ab08e95439987
27+
linux_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-aarch64-unknown-linux-gnu-install_only.tar.gz
28+
linux_arm64_sha256 = 389b9005fb78dd5a6f68df5ea45ab7b30d9a4b3222af96999e94fd20d4ad0c6a
2929

3030
[colima]
3131
darwin_x86_64 = https://github.com/abiosoft/colima/releases/download/v0.6.6/colima-Darwin-x86_64
@@ -41,12 +41,12 @@ version = v0.6.6
4141

4242
# kept here only for compatibility with older `devenv`
4343
[python]
44-
version = 3.11.6
45-
darwin_x86_64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-apple-darwin-install_only.tar.gz
46-
darwin_x86_64_sha256 = 178cb1716c2abc25cb56ae915096c1a083e60abeba57af001996e8bc6ce1a371
47-
darwin_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-apple-darwin-install_only.tar.gz
48-
darwin_arm64_sha256 = 916c35125b5d8323a21526d7a9154ca626453f63d0878e95b9f613a95006c990
49-
linux_x86_64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-unknown-linux-gnu-install_only.tar.gz
50-
linux_x86_64_sha256 = ee37a7eae6e80148c7e3abc56e48a397c1664f044920463ad0df0fc706eacea8
51-
linux_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-unknown-linux-gnu-install_only.tar.gz
52-
linux_arm64_sha256 = 3e26a672df17708c4dc928475a5974c3fb3a34a9b45c65fb4bd1e50504cc84ec
44+
version = 3.11.8
45+
darwin_x86_64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-x86_64-apple-darwin-install_only.tar.gz
46+
darwin_x86_64_sha256 = 097f467b0c36706bfec13f199a2eaf924e668f70c6e2bd1f1366806962f7e86e
47+
darwin_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-aarch64-apple-darwin-install_only.tar.gz
48+
darwin_arm64_sha256 = 389a51139f5abe071a0d70091ca5df3e7a3dfcfcbe3e0ba6ad85fb4c5638421e
49+
linux_x86_64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-x86_64-unknown-linux-gnu-install_only.tar.gz
50+
linux_x86_64_sha256 = 94e13d0e5ad417035b80580f3e893a72e094b0900d5d64e7e34ab08e95439987
51+
linux_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-aarch64-unknown-linux-gnu-install_only.tar.gz
52+
linux_arm64_sha256 = 389b9005fb78dd5a6f68df5ea45ab7b30d9a4b3222af96999e94fd20d4ad0c6a

requirements-base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ datadog>=0.49
1313
django-crispy-forms>=1.14.0
1414
django-csp>=3.8
1515
django-pg-zero-downtime-migrations>=0.13
16-
Django>=5.0.3
16+
Django>=5.0.4
1717
djangorestframework>=3.15.1
1818
drf-spectacular>=0.26.3
1919
email-reply-parser>=0.5.12

requirements-dev-frozen.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ cssutils==2.9.0
3939
datadog==0.49.1
4040
distlib==0.3.8
4141
distro==1.8.0
42-
django==5.0.3
42+
django==5.0.4
4343
django-crispy-forms==1.14.0
4444
django-csp==3.8
4545
django-pg-zero-downtime-migrations==0.13

requirements-frozen.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ cssselect==1.0.3
3232
cssutils==2.9.0
3333
datadog==0.49.1
3434
distro==1.8.0
35-
django==5.0.3
35+
django==5.0.4
3636
django-crispy-forms==1.14.0
3737
django-csp==3.8
3838
django-pg-zero-downtime-migrations==0.13

self-hosted/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11.6-slim-bullseye
1+
FROM python:3.11.8-slim-bookworm
22

33
LABEL maintainer="oss@sentry.io"
44
LABEL org.opencontainers.image.title="Sentry"
@@ -11,8 +11,8 @@ LABEL org.opencontainers.image.authors="oss@sentry.io"
1111
# add our user and group first to make sure their IDs get assigned consistently
1212
RUN groupadd -r sentry && useradd -r -m -g sentry sentry
1313

14-
ENV GOSU_VERSION=1.12 \
15-
GOSU_SHA256=0f25a21cf64e58078057adc78f38705163c1d564a959ff30a891c31917011a54 \
14+
ENV GOSU_VERSION=1.17 \
15+
GOSU_SHA256=bbc4136d03ab138b1ad66fa4fc051bafc6cc7ffae632b069a53657279a450de3 \
1616
TINI_VERSION=0.19.0 \
1717
TINI_SHA256=93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c
1818

@@ -62,7 +62,7 @@ RUN set -x \
6262
&& apt-get install -y --no-install-recommends $buildDeps \
6363
&& pip install -r /tmp/requirements-frozen.txt \
6464
&& mkdir /tmp/uwsgi-dogstatsd \
65-
# pinned the same as in getsentry
65+
# pinned the same as in getsentry
6666
&& wget -O - https://github.com/DataDog/uwsgi-dogstatsd/archive/1a04f784491ab0270b4e94feb94686b65d8d2db1.tar.gz | \
6767
tar -xzf - -C /tmp/uwsgi-dogstatsd --strip-components=1 \
6868
&& UWSGI_NEED_PLUGIN="" uwsgi --build-plugin /tmp/uwsgi-dogstatsd \

0 commit comments

Comments
 (0)