Skip to content

Commit f0c1b29

Browse files
antonpirkerantonpirker
authored
Merge branch 'master' into antonpirker/deprecate-set-measurement
2 parents 0514053 + bbdf789 commit f0c1b29

File tree

86 files changed

+2453
-1145
lines changed

Some content is hidden

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

86 files changed

+2453
-1145
lines changed

‎.flake8‎

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

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @getsentry/owners-python-sdk

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: 🐞 Bug Report
22
description: Tell us about something that's not working the way we (probably) intend.
3+
labels: ["Python", "Bug"]
34
body:
45
- type: dropdown
56
id: type

‎.github/ISSUE_TEMPLATE/feature.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: 💡 Feature Request
22
description: Create a feature request for sentry-python SDK.
3-
labels: 'enhancement'
3+
labels: ["Python", "Feature"]
44
body:
55
- type: markdown
66
attributes:

‎.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@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
23+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
2424
with:
2525
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2626
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,13 @@ jobs:
3434
# new versions of hosted runners on Github Actions
3535
# ubuntu-20.04 is the last version that supported python3.6
3636
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-20.04]
37+
os: [ubuntu-22.04]
38+
# Use Docker container only for Python 3.6
39+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
3840
steps:
3941
- uses: actions/[email protected]
4042
- uses: actions/setup-python@v5
43+
if: ${{ matrix.python-version != '3.6' }}
4144
with:
4245
python-version: ${{ matrix.python-version }}
4346
allow-prereleases: true
@@ -80,7 +83,7 @@ jobs:
8083
coverage xml
8184
- name: Upload coverage to Codecov
8285
if: ${{ !cancelled() }}
83-
uses: codecov/[email protected].0
86+
uses: codecov/[email protected].2
8487
with:
8588
token: ${{ secrets.CODECOV_TOKEN }}
8689
files: coverage.xml
@@ -101,15 +104,18 @@ jobs:
101104
strategy:
102105
fail-fast: false
103106
matrix:
104-
python-version: ["3.8","3.9","3.11","3.12"]
107+
python-version: ["3.8","3.9","3.10","3.11","3.12","3.13"]
105108
# python3.6 reached EOL and is no longer being supported on
106109
# new versions of hosted runners on Github Actions
107110
# ubuntu-20.04 is the last version that supported python3.6
108111
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
109-
os: [ubuntu-20.04]
112+
os: [ubuntu-22.04]
113+
# Use Docker container only for Python 3.6
114+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
110115
steps:
111116
- uses: actions/[email protected]
112117
- uses: actions/setup-python@v5
118+
if: ${{ matrix.python-version != '3.6' }}
113119
with:
114120
python-version: ${{ matrix.python-version }}
115121
allow-prereleases: true
@@ -152,7 +158,7 @@ jobs:
152158
coverage xml
153159
- name: Upload coverage to Codecov
154160
if: ${{ !cancelled() }}
155-
uses: codecov/[email protected].0
161+
uses: codecov/[email protected].2
156162
with:
157163
token: ${{ secrets.CODECOV_TOKEN }}
158164
files: coverage.xml
@@ -171,7 +177,7 @@ jobs:
171177
needs: test-ai-pinned
172178
# Always run this, even if a dependent job failed
173179
if: always()
174-
runs-on: ubuntu-20.04
180+
runs-on: ubuntu-22.04
175181
steps:
176182
- name: Check for failures
177183
if: contains(needs.test-ai-pinned.result, 'failure') || contains(needs.test-ai-pinned.result, 'skipped')

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,17 @@ jobs:
3434
# new versions of hosted runners on Github Actions
3535
# ubuntu-20.04 is the last version that supported python3.6
3636
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-20.04]
37+
os: [ubuntu-22.04]
3838
services:
3939
docker:
4040
image: docker:dind # Required for Docker network management
4141
options: --privileged # Required for Docker-in-Docker operations
42+
# Use Docker container only for Python 3.6
43+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4244
steps:
4345
- uses: actions/[email protected]
4446
- uses: actions/setup-python@v5
47+
if: ${{ matrix.python-version != '3.6' }}
4548
with:
4649
python-version: ${{ matrix.python-version }}
4750
allow-prereleases: true
@@ -84,7 +87,7 @@ jobs:
8487
coverage xml
8588
- name: Upload coverage to Codecov
8689
if: ${{ !cancelled() }}
87-
uses: codecov/[email protected].0
90+
uses: codecov/[email protected].2
8891
with:
8992
token: ${{ secrets.CODECOV_TOKEN }}
9093
files: coverage.xml
@@ -110,14 +113,17 @@ jobs:
110113
# new versions of hosted runners on Github Actions
111114
# ubuntu-20.04 is the last version that supported python3.6
112115
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
113-
os: [ubuntu-20.04]
116+
os: [ubuntu-22.04]
114117
services:
115118
docker:
116119
image: docker:dind # Required for Docker network management
117120
options: --privileged # Required for Docker-in-Docker operations
121+
# Use Docker container only for Python 3.6
122+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
118123
steps:
119124
- uses: actions/[email protected]
120125
- uses: actions/setup-python@v5
126+
if: ${{ matrix.python-version != '3.6' }}
121127
with:
122128
python-version: ${{ matrix.python-version }}
123129
allow-prereleases: true
@@ -160,7 +166,7 @@ jobs:
160166
coverage xml
161167
- name: Upload coverage to Codecov
162168
if: ${{ !cancelled() }}
163-
uses: codecov/[email protected].0
169+
uses: codecov/[email protected].2
164170
with:
165171
token: ${{ secrets.CODECOV_TOKEN }}
166172
files: coverage.xml
@@ -179,7 +185,7 @@ jobs:
179185
needs: test-cloud-pinned
180186
# Always run this, even if a dependent job failed
181187
if: always()
182-
runs-on: ubuntu-20.04
188+
runs-on: ubuntu-22.04
183189
steps:
184190
- name: Check for failures
185191
if: contains(needs.test-cloud-pinned.result, 'failure') || contains(needs.test-cloud-pinned.result, 'skipped')

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,13 @@ jobs:
3434
# new versions of hosted runners on Github Actions
3535
# ubuntu-20.04 is the last version that supported python3.6
3636
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-20.04]
37+
os: [ubuntu-22.04]
38+
# Use Docker container only for Python 3.6
39+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
3840
steps:
3941
- uses: actions/[email protected]
4042
- uses: actions/setup-python@v5
43+
if: ${{ matrix.python-version != '3.6' }}
4144
with:
4245
python-version: ${{ matrix.python-version }}
4346
allow-prereleases: true
@@ -64,7 +67,7 @@ jobs:
6467
coverage xml
6568
- name: Upload coverage to Codecov
6669
if: ${{ !cancelled() }}
67-
uses: codecov/[email protected].0
70+
uses: codecov/[email protected].2
6871
with:
6972
token: ${{ secrets.CODECOV_TOKEN }}
7073
files: coverage.xml
@@ -83,7 +86,7 @@ jobs:
8386
needs: test-common-pinned
8487
# Always run this, even if a dependent job failed
8588
if: always()
86-
runs-on: ubuntu-20.04
89+
runs-on: ubuntu-22.04
8790
steps:
8891
- name: Check for failures
8992
if: contains(needs.test-common-pinned.result, 'failure') || contains(needs.test-common-pinned.result, 'skipped')

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# new versions of hosted runners on Github Actions
3535
# ubuntu-20.04 is the last version that supported python3.6
3636
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-20.04]
37+
os: [ubuntu-22.04]
3838
services:
3939
postgres:
4040
image: postgres
@@ -50,17 +50,20 @@ jobs:
5050
ports:
5151
- 5432:5432
5252
env:
53-
SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
53+
SENTRY_PYTHON_TEST_POSTGRES_HOST: ${{ matrix.python-version == '3.6' && 'postgres' || 'localhost' }}
5454
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
5555
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
56+
# Use Docker container only for Python 3.6
57+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
5658
steps:
5759
- uses: actions/[email protected]
5860
- uses: actions/setup-python@v5
61+
if: ${{ matrix.python-version != '3.6' }}
5962
with:
6063
python-version: ${{ matrix.python-version }}
6164
allow-prereleases: true
6265
- name: "Setup ClickHouse Server"
63-
uses: getsentry/action-clickhouse-in-ci@v1.5
66+
uses: getsentry/action-clickhouse-in-ci@v1.6
6467
- name: Setup Test Env
6568
run: |
6669
pip install "coverage[toml]" tox
@@ -104,7 +107,7 @@ jobs:
104107
coverage xml
105108
- name: Upload coverage to Codecov
106109
if: ${{ !cancelled() }}
107-
uses: codecov/[email protected].0
110+
uses: codecov/[email protected].2
108111
with:
109112
token: ${{ secrets.CODECOV_TOKEN }}
110113
files: coverage.xml
@@ -130,7 +133,7 @@ jobs:
130133
# new versions of hosted runners on Github Actions
131134
# ubuntu-20.04 is the last version that supported python3.6
132135
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
133-
os: [ubuntu-20.04]
136+
os: [ubuntu-22.04]
134137
services:
135138
postgres:
136139
image: postgres
@@ -146,17 +149,20 @@ jobs:
146149
ports:
147150
- 5432:5432
148151
env:
149-
SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
152+
SENTRY_PYTHON_TEST_POSTGRES_HOST: ${{ matrix.python-version == '3.6' && 'postgres' || 'localhost' }}
150153
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
151154
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
155+
# Use Docker container only for Python 3.6
156+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
152157
steps:
153158
- uses: actions/[email protected]
154159
- uses: actions/setup-python@v5
160+
if: ${{ matrix.python-version != '3.6' }}
155161
with:
156162
python-version: ${{ matrix.python-version }}
157163
allow-prereleases: true
158164
- name: "Setup ClickHouse Server"
159-
uses: getsentry/action-clickhouse-in-ci@v1.5
165+
uses: getsentry/action-clickhouse-in-ci@v1.6
160166
- name: Setup Test Env
161167
run: |
162168
pip install "coverage[toml]" tox
@@ -200,7 +206,7 @@ jobs:
200206
coverage xml
201207
- name: Upload coverage to Codecov
202208
if: ${{ !cancelled() }}
203-
uses: codecov/[email protected].0
209+
uses: codecov/[email protected].2
204210
with:
205211
token: ${{ secrets.CODECOV_TOKEN }}
206212
files: coverage.xml
@@ -219,7 +225,7 @@ jobs:
219225
needs: test-dbs-pinned
220226
# Always run this, even if a dependent job failed
221227
if: always()
222-
runs-on: ubuntu-20.04
228+
runs-on: ubuntu-22.04
223229
steps:
224230
- name: Check for failures
225231
if: contains(needs.test-dbs-pinned.result, 'failure') || contains(needs.test-dbs-pinned.result, 'skipped')

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,13 @@ jobs:
3434
# new versions of hosted runners on Github Actions
3535
# ubuntu-20.04 is the last version that supported python3.6
3636
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-20.04]
37+
os: [ubuntu-22.04]
38+
# Use Docker container only for Python 3.6
39+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
3840
steps:
3941
- uses: actions/[email protected]
4042
- uses: actions/setup-python@v5
43+
if: ${{ matrix.python-version != '3.6' }}
4144
with:
4245
python-version: ${{ matrix.python-version }}
4346
allow-prereleases: true
@@ -76,7 +79,7 @@ jobs:
7679
coverage xml
7780
- name: Upload coverage to Codecov
7881
if: ${{ !cancelled() }}
79-
uses: codecov/[email protected].0
82+
uses: codecov/[email protected].2
8083
with:
8184
token: ${{ secrets.CODECOV_TOKEN }}
8285
files: coverage.xml
@@ -95,7 +98,7 @@ jobs:
9598
needs: test-flags-pinned
9699
# Always run this, even if a dependent job failed
97100
if: always()
98-
runs-on: ubuntu-20.04
101+
runs-on: ubuntu-22.04
99102
steps:
100103
- name: Check for failures
101104
if: contains(needs.test-flags-pinned.result, 'failure') || contains(needs.test-flags-pinned.result, 'skipped')

0 commit comments

Comments
 (0)