From b05698e27ca7dac0f96ea3126e0a9e0257fbd78e Mon Sep 17 00:00:00 2001 From: mdtro <20070360+mdtro@users.noreply.github.com> Date: Wed, 24 Apr 2024 16:55:05 -0500 Subject: [PATCH 1/2] chore(deps): bump python, gosu, and Django --- .github/actions/setup-sentry/action.yml | 2 +- .github/workflows/backend.yml | 4 +- .github/workflows/development-environment.yml | 4 +- .github/workflows/pre-commit.yml | 2 +- .python-version | 2 +- devenv/config.ini | 40 +++++++++---------- requirements-base.txt | 2 +- self-hosted/Dockerfile | 8 ++-- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/actions/setup-sentry/action.yml b/.github/actions/setup-sentry/action.yml index c17717ba26571e..aedc1d3140d3a7 100644 --- a/.github/actions/setup-sentry/action.yml +++ b/.github/actions/setup-sentry/action.yml @@ -38,7 +38,7 @@ inputs: python-version: description: 'python version to install' required: false - default: '3.11.6' + default: '3.11.8' pg-version: description: 'PostgreSQL version to use' default: '14' diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 25ce727359bf13..b1cd110cab031a 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -210,7 +210,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0 with: - python-version: 3.11.6 + python-version: 3.11.8 cache-dependency-path: requirements-dev-frozen.txt install-cmd: python3 -m tools.hack_pip && pip install -q --constraint requirements-dev-frozen.txt pip-tools - name: check requirements @@ -306,7 +306,7 @@ jobs: - uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0 with: - python-version: 3.11.6 + python-version: 3.11.8 cache-dependency-path: requirements-dev-frozen.txt install-cmd: python3 -m tools.hack_pip && pip install -r requirements-dev-frozen.txt diff --git a/.github/workflows/development-environment.yml b/.github/workflows/development-environment.yml index 929c886cfcb459..613af592cc3dd5 100644 --- a/.github/workflows/development-environment.yml +++ b/.github/workflows/development-environment.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0 with: - python-version: 3.11.6 + python-version: 3.11.8 cache-dependency-path: | requirements-dev.txt requirements-dev-frozen.txt @@ -51,7 +51,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0 with: - python-version: 3.11.6 + python-version: 3.11.8 cache-dependency-path: | requirements-dev.txt requirements-dev-frozen.txt diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 752fcc35505e5f..7af2659155678c 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -55,7 +55,7 @@ jobs: - uses: getsentry/action-setup-venv@a133e6fd5fa6abd3f590a1c106abda344f5df69f # v2.1.0 with: - python-version: 3.11.6 + python-version: 3.11.8 cache-dependency-path: | requirements-dev.txt requirements-dev-frozen.txt diff --git a/.python-version b/.python-version index 375f5cabfe6cd1..b6d8b7612f0efe 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.11.6 +3.11.8 diff --git a/devenv/config.ini b/devenv/config.ini index 0e6760548fe08d..6bb9b112ee3273 100644 --- a/devenv/config.ini +++ b/devenv/config.ini @@ -1,5 +1,5 @@ [venv.sentry] -python = 3.11.6 +python = 3.11.8 path = .venv requirements = requirements-dev.txt editable = @@ -8,7 +8,7 @@ editable = # bins = [venv.getsentry] -python = 3.11.6 +python = 3.11.8 # technically these are conflicting paths but getsentry is special # and would rather keep devenv config symlinked path = .venv @@ -17,15 +17,15 @@ editable = . # but we'll just install it during sync as it's rarely populated requirements = sentry-requirements-dev-frozen.txt -[python3.11.6] -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 -darwin_x86_64_sha256 = 178cb1716c2abc25cb56ae915096c1a083e60abeba57af001996e8bc6ce1a371 -darwin_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-apple-darwin-install_only.tar.gz -darwin_arm64_sha256 = 916c35125b5d8323a21526d7a9154ca626453f63d0878e95b9f613a95006c990 -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 -linux_x86_64_sha256 = ee37a7eae6e80148c7e3abc56e48a397c1664f044920463ad0df0fc706eacea8 -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 -linux_arm64_sha256 = 3e26a672df17708c4dc928475a5974c3fb3a34a9b45c65fb4bd1e50504cc84ec +[python3.11.8] +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 +darwin_x86_64_sha256 = 097f467b0c36706bfec13f199a2eaf924e668f70c6e2bd1f1366806962f7e86e +darwin_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-aarch64-apple-darwin-install_only.tar.gz +darwin_arm64_sha256 = 389a51139f5abe071a0d70091ca5df3e7a3dfcfcbe3e0ba6ad85fb4c5638421e +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 +linux_x86_64_sha256 = 94e13d0e5ad417035b80580f3e893a72e094b0900d5d64e7e34ab08e95439987 +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 +linux_arm64_sha256 = 389b9005fb78dd5a6f68df5ea45ab7b30d9a4b3222af96999e94fd20d4ad0c6a [colima] 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 # kept here only for compatibility with older `devenv` [python] -version = 3.11.6 -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 -darwin_x86_64_sha256 = 178cb1716c2abc25cb56ae915096c1a083e60abeba57af001996e8bc6ce1a371 -darwin_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-apple-darwin-install_only.tar.gz -darwin_arm64_sha256 = 916c35125b5d8323a21526d7a9154ca626453f63d0878e95b9f613a95006c990 -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 -linux_x86_64_sha256 = ee37a7eae6e80148c7e3abc56e48a397c1664f044920463ad0df0fc706eacea8 -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 -linux_arm64_sha256 = 3e26a672df17708c4dc928475a5974c3fb3a34a9b45c65fb4bd1e50504cc84ec +version = 3.11.8 +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 +darwin_x86_64_sha256 = 097f467b0c36706bfec13f199a2eaf924e668f70c6e2bd1f1366806962f7e86e +darwin_arm64 = https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8+20240224-aarch64-apple-darwin-install_only.tar.gz +darwin_arm64_sha256 = 389a51139f5abe071a0d70091ca5df3e7a3dfcfcbe3e0ba6ad85fb4c5638421e +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 +linux_x86_64_sha256 = 94e13d0e5ad417035b80580f3e893a72e094b0900d5d64e7e34ab08e95439987 +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 +linux_arm64_sha256 = 389b9005fb78dd5a6f68df5ea45ab7b30d9a4b3222af96999e94fd20d4ad0c6a diff --git a/requirements-base.txt b/requirements-base.txt index f64decbf7bedc0..d2d0e4018c6886 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -13,7 +13,7 @@ datadog>=0.49 django-crispy-forms>=1.14.0 django-csp>=3.8 django-pg-zero-downtime-migrations>=0.13 -Django>=5.0.3 +Django>=5.0.4 djangorestframework>=3.15.1 drf-spectacular>=0.26.3 email-reply-parser>=0.5.12 diff --git a/self-hosted/Dockerfile b/self-hosted/Dockerfile index 840f8b3637974d..4fcc65cc321d5d 100644 --- a/self-hosted/Dockerfile +++ b/self-hosted/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11.6-slim-bullseye +FROM python:3.11.8-slim-bookworm LABEL maintainer="oss@sentry.io" LABEL org.opencontainers.image.title="Sentry" @@ -11,8 +11,8 @@ LABEL org.opencontainers.image.authors="oss@sentry.io" # add our user and group first to make sure their IDs get assigned consistently RUN groupadd -r sentry && useradd -r -m -g sentry sentry -ENV GOSU_VERSION=1.12 \ - GOSU_SHA256=0f25a21cf64e58078057adc78f38705163c1d564a959ff30a891c31917011a54 \ +ENV GOSU_VERSION=1.17 \ + GOSU_SHA256=bbc4136d03ab138b1ad66fa4fc051bafc6cc7ffae632b069a53657279a450de3 \ TINI_VERSION=0.19.0 \ TINI_SHA256=93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c @@ -62,7 +62,7 @@ RUN set -x \ && apt-get install -y --no-install-recommends $buildDeps \ && pip install -r /tmp/requirements-frozen.txt \ && mkdir /tmp/uwsgi-dogstatsd \ - # pinned the same as in getsentry + # pinned the same as in getsentry && wget -O - https://github.com/DataDog/uwsgi-dogstatsd/archive/1a04f784491ab0270b4e94feb94686b65d8d2db1.tar.gz | \ tar -xzf - -C /tmp/uwsgi-dogstatsd --strip-components=1 \ && UWSGI_NEED_PLUGIN="" uwsgi --build-plugin /tmp/uwsgi-dogstatsd \ From f4753eced86650b96d00f17edf5f7956d0625d01 Mon Sep 17 00:00:00 2001 From: "getsantry[bot]" <66042841+getsantry[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 22:08:20 +0000 Subject: [PATCH 2/2] :snowflake: re-freeze requirements --- requirements-dev-frozen.txt | 2 +- requirements-frozen.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev-frozen.txt b/requirements-dev-frozen.txt index 02789f9aa935d8..5e252f140fafc7 100644 --- a/requirements-dev-frozen.txt +++ b/requirements-dev-frozen.txt @@ -39,7 +39,7 @@ cssutils==2.9.0 datadog==0.49.1 distlib==0.3.8 distro==1.8.0 -django==5.0.3 +django==5.0.4 django-crispy-forms==1.14.0 django-csp==3.8 django-pg-zero-downtime-migrations==0.13 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 4a32ae190a3db3..a0292a5c556e19 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -32,7 +32,7 @@ cssselect==1.0.3 cssutils==2.9.0 datadog==0.49.1 distro==1.8.0 -django==5.0.3 +django==5.0.4 django-crispy-forms==1.14.0 django-csp==3.8 django-pg-zero-downtime-migrations==0.13