Skip to content

Commit fafa7d0

Browse files
committed
chore: Move script running to uv
* Invoke `find_raise_from_none` with uv * Remove `linters` from `tox` completely * Remove unused `ready_yet` * Invoke `populate_tox` and `split_tox_gh_actions` with uv * Move `apidocs` to uv * Move from `make build` to `uv build` (verification of contents below) * Move from `make aws-lambda-layer` to uv * Remove `Makefile` completely * Remove unused `dist-serverless` from github workflows ⏺ Sdist contents identical too — the 9-byte difference is just tarball/gzip metadata (timestamps, header). Final summary: Artifact: Wheel filename make dist: sentry_sdk-2.61.0-py3-none-any.whl uv build: same Diff: ✓ ──────────────────────────────────────── Artifact: Wheel bytes make dist: 483,104 uv build: 483,104 Diff: ✓ identical ──────────────────────────────────────── Artifact: Wheel contents make dist: — uv build: — Diff: ✓ identical (recursive diff clean) ──────────────────────────────────────── Artifact: Sdist filename make dist: sentry_sdk-2.61.0.tar.gz uv build: same Diff: ✓ ──────────────────────────────────────── Artifact: Sdist file list make dist: — uv build: — Diff: ✓ identical ──────────────────────────────────────── Artifact: Sdist contents make dist: — uv build: — Diff: ✓ identical (recursive diff clean) ──────────────────────────────────────── Artifact: Sdist bytes make dist: 459,825 uv build: 459,834 Diff: tarball metadata only (9 bytes)
1 parent 5e18c7c commit fafa7d0

37 files changed

Lines changed: 446 additions & 377 deletions

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
-->
99

1010
#### Reminders
11-
- Please add tests to validate your changes, and lint your code using `tox -e linters`.
11+
- Please add tests to validate your changes, and lint your code using `uv run ruff`.
1212
- Add GH Issue ID _&_ Linear ID (if applicable)
1313
- PR title should use [conventional commit](https://develop.sentry.dev/engineering-practices/commit-messages/#type) style (`feat:`, `fix:`, `ref:`, `meta:`)
1414
- For external contributors: [CONTRIBUTING.md](https://github.com/getsentry/sentry-python/blob/master/CONTRIBUTING.md), [Sentry SDK development docs](https://develop.sentry.dev/sdk/), [Discord community](https://discord.gg/Ww9hbqr)

.github/workflows/ci.yml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ concurrency:
1515
permissions:
1616
contents: read
1717

18-
env:
19-
BUILD_CACHE_KEY: ${{ github.sha }}
20-
CACHED_BUILD_PATHS: |
21-
${{ github.workspace }}/dist-serverless
22-
2318
jobs:
2419
lint:
2520
name: Lint Sources
@@ -39,8 +34,8 @@ jobs:
3934
- name: Ruff format
4035
run: uv run ruff format --check tests sentry_sdk
4136

42-
- name: Linters
43-
run: uv run tox -e linters
37+
- name: Find raise from None
38+
run: uv run python scripts/find_raise_from_none.py
4439

4540
- name: Mypy
4641
run: uv run --group typing mypy sentry_sdk
@@ -52,20 +47,16 @@ jobs:
5247

5348
steps:
5449
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
55-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
56-
with:
57-
python-version: 3.12
58-
- name: Setup build cache
59-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
60-
id: build_cache
50+
- name: Install uv
51+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6152
with:
62-
path: ${{ env.CACHED_BUILD_PATHS }}
63-
key: ${{ env.BUILD_CACHE_KEY }}
53+
python-version: 3.14
6454
- name: Build Packages
6555
run: |
66-
echo "Creating directory containing Python SDK Lambda Layer"
67-
# This will also trigger "make dist" that creates the Python packages
68-
make aws-lambda-layer
56+
echo "Building SDK dist wheel and tar.gz"
57+
uv build
58+
echo "Building AWS Lambda Layer"
59+
uv run --group aws --with-editable . python scripts/build_aws_lambda_layer.py
6960
- name: Upload Python Packages
7061
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
7162
with:
@@ -81,12 +72,14 @@ jobs:
8172

8273
steps:
8374
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
84-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
75+
- name: Install uv
76+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
8577
with:
86-
python-version: 3.12
78+
python-version: 3.14
8779

8880
- run: |
89-
make apidocs
81+
rm -rf docs/_build
82+
uv run --group docs sphinx-build -vv -W -b html docs/ docs/_build
9083
cd docs/_build && zip -r gh-pages ./
9184
9285
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7

.github/workflows/test-integrations-agents.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ permissions:
2020
actions: read
2121
pull-requests: write
2222
statuses: write
23-
env:
24-
BUILD_CACHE_KEY: ${{ github.sha }}
25-
CACHED_BUILD_PATHS: |
26-
${{ github.workspace }}/dist-serverless
2723
jobs:
2824
test-agents:
2925
name: Agents
@@ -42,6 +38,8 @@ jobs:
4238
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4339
- name: Install uv
4440
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
41+
with:
42+
cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
4543
- name: Mark workspace safe for git (3.6/3.7 container)
4644
# needed to make git rev-parse work in the containers
4745
# subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.

.github/workflows/test-integrations-ai-workflow.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ permissions:
2020
actions: read
2121
pull-requests: write
2222
statuses: write
23-
env:
24-
BUILD_CACHE_KEY: ${{ github.sha }}
25-
CACHED_BUILD_PATHS: |
26-
${{ github.workspace }}/dist-serverless
2723
jobs:
2824
test-ai_workflow:
2925
name: AI Workflow
@@ -42,6 +38,8 @@ jobs:
4238
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4339
- name: Install uv
4440
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
41+
with:
42+
cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
4543
- name: Mark workspace safe for git (3.6/3.7 container)
4644
# needed to make git rev-parse work in the containers
4745
# subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.

.github/workflows/test-integrations-ai.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ permissions:
2020
actions: read
2121
pull-requests: write
2222
statuses: write
23-
env:
24-
BUILD_CACHE_KEY: ${{ github.sha }}
25-
CACHED_BUILD_PATHS: |
26-
${{ github.workspace }}/dist-serverless
2723
jobs:
2824
test-ai:
2925
name: AI
@@ -42,6 +38,8 @@ jobs:
4238
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4339
- name: Install uv
4440
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
41+
with:
42+
cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
4543
- name: Mark workspace safe for git (3.6/3.7 container)
4644
# needed to make git rev-parse work in the containers
4745
# subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.

.github/workflows/test-integrations-cloud.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ permissions:
2020
actions: read
2121
pull-requests: write
2222
statuses: write
23-
env:
24-
BUILD_CACHE_KEY: ${{ github.sha }}
25-
CACHED_BUILD_PATHS: |
26-
${{ github.workspace }}/dist-serverless
2723
jobs:
2824
test-cloud:
2925
name: Cloud
@@ -46,6 +42,8 @@ jobs:
4642
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4743
- name: Install uv
4844
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
45+
with:
46+
cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
4947
- name: Mark workspace safe for git (3.6/3.7 container)
5048
# needed to make git rev-parse work in the containers
5149
# subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.

.github/workflows/test-integrations-common.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ permissions:
2020
actions: read
2121
pull-requests: write
2222
statuses: write
23-
env:
24-
BUILD_CACHE_KEY: ${{ github.sha }}
25-
CACHED_BUILD_PATHS: |
26-
${{ github.workspace }}/dist-serverless
2723
jobs:
2824
test-common:
2925
name: Common
@@ -42,6 +38,8 @@ jobs:
4238
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4339
- name: Install uv
4440
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
41+
with:
42+
cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
4543
- name: Mark workspace safe for git (3.6/3.7 container)
4644
# needed to make git rev-parse work in the containers
4745
# subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.

.github/workflows/test-integrations-dbs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ permissions:
2020
actions: read
2121
pull-requests: write
2222
statuses: write
23-
env:
24-
BUILD_CACHE_KEY: ${{ github.sha }}
25-
CACHED_BUILD_PATHS: |
26-
${{ github.workspace }}/dist-serverless
2723
jobs:
2824
test-dbs:
2925
name: DBs
@@ -59,6 +55,8 @@ jobs:
5955
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6056
- name: Install uv
6157
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
58+
with:
59+
cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
6260
- name: "Setup ClickHouse Server"
6361
uses: getsentry/action-clickhouse-in-ci@5dc8a6a50d689bd6051db0241f34849e5a36490b # v1.7
6462
- name: Mark workspace safe for git (3.6/3.7 container)

.github/workflows/test-integrations-flags.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ permissions:
2020
actions: read
2121
pull-requests: write
2222
statuses: write
23-
env:
24-
BUILD_CACHE_KEY: ${{ github.sha }}
25-
CACHED_BUILD_PATHS: |
26-
${{ github.workspace }}/dist-serverless
2723
jobs:
2824
test-flags:
2925
name: Flags
@@ -42,6 +38,8 @@ jobs:
4238
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4339
- name: Install uv
4440
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
41+
with:
42+
cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
4543
- name: Mark workspace safe for git (3.6/3.7 container)
4644
# needed to make git rev-parse work in the containers
4745
# subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.

.github/workflows/test-integrations-gevent.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ permissions:
2020
actions: read
2121
pull-requests: write
2222
statuses: write
23-
env:
24-
BUILD_CACHE_KEY: ${{ github.sha }}
25-
CACHED_BUILD_PATHS: |
26-
${{ github.workspace }}/dist-serverless
2723
jobs:
2824
test-gevent:
2925
name: Gevent
@@ -42,6 +38,8 @@ jobs:
4238
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4339
- name: Install uv
4440
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
41+
with:
42+
cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
4543
- name: Mark workspace safe for git (3.6/3.7 container)
4644
# needed to make git rev-parse work in the containers
4745
# subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.

0 commit comments

Comments
 (0)