Skip to content

Commit 0514053

Browse files
antonpirkerantonpirker
authored
Merge branch 'master' into antonpirker/deprecate-set-measurement
2 parents 533a95b + 12b3ca3 commit 0514053

File tree

167 files changed

+8269
-2862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+8269
-2862
lines changed

‎.craft.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ targets:
2525
- python3.9
2626
- python3.10
2727
- python3.11
28+
- python3.12
29+
- python3.13
2830
license: MIT
2931
- name: sentry-pypi
3032
internalPypiRepo: getsentry/pypi

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`.
66

7-
Running the test suite on your PR might require maintainer approval. The AWS Lambda tests additionally require a maintainer to add a special label, and they will fail until this label is added.
7+
Running the test suite on your PR might require maintainer approval.

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ jobs:
4444
with:
4545
python-version: 3.12
4646

47-
- run: |
47+
- name: Detect unexpected changes to tox.ini or CI
48+
run: |
49+
pip install -e .
50+
pip install -r scripts/populate_tox/requirements.txt
51+
python scripts/populate_tox/populate_tox.py --fail-on-changes
4852
pip install -r scripts/split_tox_gh_actions/requirements.txt
4953
python scripts/split_tox_gh_actions/split_tox_gh_actions.py --fail-on-changes
5054

‎.github/workflows/release-comment-issues.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ jobs:
1717
steps:
1818
- name: Get version
1919
id: get_version
20-
run: echo "version=${{ github.event.inputs.version || github.event.release.tag_name }}" >> $GITHUB_OUTPUT
20+
env:
21+
INPUTS_VERSION: ${{ github.event.inputs.version }}
22+
RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
23+
run: echo "version=${$INPUTS_VERSION:-$RELEASE_TAG_NAME}" >> "$GITHUB_OUTPUT"
2124

2225
- name: Comment on linked issues that are mentioned in release
2326
if: |
@@ -28,4 +31,4 @@ jobs:
2831
uses: getsentry/release-comment-issues-gh-action@v1
2932
with:
3033
github_token: ${{ secrets.GITHUB_TOKEN }}
31-
version: ${{ steps.get_version.outputs.version }}
34+
version: ${{ steps.get_version.outputs.version }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- name: Get auth token
2222
id: token
23-
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
23+
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
2424
with:
2525
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2626
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

‎.github/workflows/scripts/trigger_tests_on_label.py‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.7","3.9","3.11","3.12","3.13"]
32+
python-version: ["3.7","3.9","3.11","3.12"]
3333
# python3.6 reached EOL and is no longer being supported on
3434
# new versions of hosted runners on Github Actions
3535
# ubuntu-20.04 is the last version that supported python3.6
@@ -80,7 +80,7 @@ jobs:
8080
coverage xml
8181
- name: Upload coverage to Codecov
8282
if: ${{ !cancelled() }}
83-
uses: codecov/codecov-action@v5.1.2
83+
uses: codecov/codecov-action@v5.4.0
8484
with:
8585
token: ${{ secrets.CODECOV_TOKEN }}
8686
files: coverage.xml
@@ -101,7 +101,7 @@ jobs:
101101
strategy:
102102
fail-fast: false
103103
matrix:
104-
python-version: ["3.8","3.9","3.11","3.12","3.13"]
104+
python-version: ["3.8","3.9","3.11","3.12"]
105105
# python3.6 reached EOL and is no longer being supported on
106106
# new versions of hosted runners on Github Actions
107107
# ubuntu-20.04 is the last version that supported python3.6
@@ -152,7 +152,7 @@ jobs:
152152
coverage xml
153153
- name: Upload coverage to Codecov
154154
if: ${{ !cancelled() }}
155-
uses: codecov/codecov-action@v5.1.2
155+
uses: codecov/codecov-action@v5.4.0
156156
with:
157157
token: ${{ secrets.CODECOV_TOKEN }}
158158
files: coverage.xml

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
# ubuntu-20.04 is the last version that supported python3.6
3636
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3737
os: [ubuntu-20.04]
38+
services:
39+
docker:
40+
image: docker:dind # Required for Docker network management
41+
options: --privileged # Required for Docker-in-Docker operations
3842
steps:
3943
- uses: actions/[email protected]
4044
- uses: actions/setup-python@v5
@@ -47,6 +51,10 @@ jobs:
4751
- name: Erase coverage
4852
run: |
4953
coverage erase
54+
- name: Test aws_lambda latest
55+
run: |
56+
set -x # print commands that are executed
57+
./scripts/runtox.sh "py${{ matrix.python-version }}-aws_lambda-latest"
5058
- name: Test boto3 latest
5159
run: |
5260
set -x # print commands that are executed
@@ -76,7 +84,7 @@ jobs:
7684
coverage xml
7785
- name: Upload coverage to Codecov
7886
if: ${{ !cancelled() }}
79-
uses: codecov/codecov-action@v5.1.2
87+
uses: codecov/codecov-action@v5.4.0
8088
with:
8189
token: ${{ secrets.CODECOV_TOKEN }}
8290
files: coverage.xml
@@ -97,12 +105,16 @@ jobs:
97105
strategy:
98106
fail-fast: false
99107
matrix:
100-
python-version: ["3.6","3.7","3.9","3.11","3.12","3.13"]
108+
python-version: ["3.6","3.7","3.8","3.9","3.11","3.12","3.13"]
101109
# python3.6 reached EOL and is no longer being supported on
102110
# new versions of hosted runners on Github Actions
103111
# ubuntu-20.04 is the last version that supported python3.6
104112
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
105113
os: [ubuntu-20.04]
114+
services:
115+
docker:
116+
image: docker:dind # Required for Docker network management
117+
options: --privileged # Required for Docker-in-Docker operations
106118
steps:
107119
- uses: actions/[email protected]
108120
- uses: actions/setup-python@v5
@@ -115,6 +127,10 @@ jobs:
115127
- name: Erase coverage
116128
run: |
117129
coverage erase
130+
- name: Test aws_lambda pinned
131+
run: |
132+
set -x # print commands that are executed
133+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
118134
- name: Test boto3 pinned
119135
run: |
120136
set -x # print commands that are executed
@@ -144,7 +160,7 @@ jobs:
144160
coverage xml
145161
- name: Upload coverage to Codecov
146162
if: ${{ !cancelled() }}
147-
uses: codecov/codecov-action@v5.1.2
163+
uses: codecov/codecov-action@v5.4.0
148164
with:
149165
token: ${{ secrets.CODECOV_TOKEN }}
150166
files: coverage.xml

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
coverage xml
6565
- name: Upload coverage to Codecov
6666
if: ${{ !cancelled() }}
67-
uses: codecov/codecov-action@v5.1.2
67+
uses: codecov/codecov-action@v5.4.0
6868
with:
6969
token: ${{ secrets.CODECOV_TOKEN }}
7070
files: coverage.xml

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ jobs:
5959
with:
6060
python-version: ${{ matrix.python-version }}
6161
allow-prereleases: true
62-
- uses: getsentry/[email protected]
62+
- name: "Setup ClickHouse Server"
63+
uses: getsentry/[email protected]
6364
- name: Setup Test Env
6465
run: |
6566
pip install "coverage[toml]" tox
@@ -103,7 +104,7 @@ jobs:
103104
coverage xml
104105
- name: Upload coverage to Codecov
105106
if: ${{ !cancelled() }}
106-
uses: codecov/codecov-action@v5.1.2
107+
uses: codecov/codecov-action@v5.4.0
107108
with:
108109
token: ${{ secrets.CODECOV_TOKEN }}
109110
files: coverage.xml
@@ -124,7 +125,7 @@ jobs:
124125
strategy:
125126
fail-fast: false
126127
matrix:
127-
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
128+
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
128129
# python3.6 reached EOL and is no longer being supported on
129130
# new versions of hosted runners on Github Actions
130131
# ubuntu-20.04 is the last version that supported python3.6
@@ -154,7 +155,8 @@ jobs:
154155
with:
155156
python-version: ${{ matrix.python-version }}
156157
allow-prereleases: true
157-
- uses: getsentry/[email protected]
158+
- name: "Setup ClickHouse Server"
159+
uses: getsentry/[email protected]
158160
- name: Setup Test Env
159161
run: |
160162
pip install "coverage[toml]" tox
@@ -198,7 +200,7 @@ jobs:
198200
coverage xml
199201
- name: Upload coverage to Codecov
200202
if: ${{ !cancelled() }}
201-
uses: codecov/codecov-action@v5.1.2
203+
uses: codecov/codecov-action@v5.4.0
202204
with:
203205
token: ${{ secrets.CODECOV_TOKEN }}
204206
files: coverage.xml

0 commit comments

Comments
 (0)