Skip to content

Commit a487a13

Browse files
committed
Merge branch 'master' into ivana/toxgen/sanic
2 parents 37a0b41 + 4329383 commit a487a13

Some content is hidden

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

66 files changed

+1815
-613
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1-
<!-- Describe your PR here -->
1+
### Description
2+
<!-- What changed and why? -->
23

3-
---
4+
#### Issues
5+
<!--
6+
* resolves: #1234
7+
* resolves: LIN-1234
8+
-->
49

5-
Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`.
6-
7-
Running the test suite on your PR might require maintainer approval.
10+
#### Reminders
11+
- Please add tests to validate your changes, and lint your code using `tox -e linters`.
12+
- Add GH Issue ID _&_ Linear ID (if applicable)
13+
- PR title should use [conventional commit](https://develop.sentry.dev/engineering-practices/commit-messages/#type) style (`feat:`, `fix:`, `ref:`, `meta:`)
14+
- 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- uses: actions/[email protected]
28-
- uses: actions/setup-python@v5
28+
- uses: actions/setup-python@v6
2929
with:
3030
python-version: 3.12
3131

@@ -40,7 +40,7 @@ jobs:
4040

4141
steps:
4242
- uses: actions/[email protected]
43-
- uses: actions/setup-python@v5
43+
- uses: actions/setup-python@v6
4444
with:
4545
python-version: 3.12
4646

@@ -59,7 +59,7 @@ jobs:
5959

6060
steps:
6161
- uses: actions/[email protected]
62-
- uses: actions/setup-python@v5
62+
- uses: actions/setup-python@v6
6363
with:
6464
python-version: 3.12
6565
- name: Setup build cache
@@ -90,7 +90,7 @@ jobs:
9090

9191
steps:
9292
- uses: actions/[email protected]
93-
- uses: actions/setup-python@v5
93+
- uses: actions/setup-python@v6
9494
with:
9595
python-version: 3.12
9696

.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@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
23+
uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4040
steps:
4141
- uses: actions/[email protected]
42-
- uses: actions/setup-python@v5
42+
- uses: actions/setup-python@v6
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
4545
python-version: ${{ matrix.python-version }}
@@ -99,7 +99,7 @@ jobs:
9999
coverage xml
100100
- name: Upload coverage to Codecov
101101
if: ${{ !cancelled() }}
102-
uses: codecov/[email protected].0
102+
uses: codecov/[email protected].1
103103
with:
104104
token: ${{ secrets.CODECOV_TOKEN }}
105105
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4444
steps:
4545
- uses: actions/[email protected]
46-
- uses: actions/setup-python@v5
46+
- uses: actions/setup-python@v6
4747
if: ${{ matrix.python-version != '3.6' }}
4848
with:
4949
python-version: ${{ matrix.python-version }}
@@ -87,7 +87,7 @@ jobs:
8787
coverage xml
8888
- name: Upload coverage to Codecov
8989
if: ${{ !cancelled() }}
90-
uses: codecov/[email protected].0
90+
uses: codecov/[email protected].1
9191
with:
9292
token: ${{ secrets.CODECOV_TOKEN }}
9393
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4040
steps:
4141
- uses: actions/[email protected]
42-
- uses: actions/setup-python@v5
42+
- uses: actions/setup-python@v6
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
4545
python-version: ${{ matrix.python-version }}
@@ -67,7 +67,7 @@ jobs:
6767
coverage xml
6868
- name: Upload coverage to Codecov
6969
if: ${{ !cancelled() }}
70-
uses: codecov/[email protected].0
70+
uses: codecov/[email protected].1
7171
with:
7272
token: ${{ secrets.CODECOV_TOKEN }}
7373
files: coverage.xml

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
5858
steps:
5959
- uses: actions/[email protected]
60-
- uses: actions/setup-python@v5
60+
- uses: actions/setup-python@v6
6161
if: ${{ matrix.python-version != '3.6' }}
6262
with:
6363
python-version: ${{ matrix.python-version }}
@@ -107,7 +107,7 @@ jobs:
107107
coverage xml
108108
- name: Upload coverage to Codecov
109109
if: ${{ !cancelled() }}
110-
uses: codecov/[email protected].0
110+
uses: codecov/[email protected].1
111111
with:
112112
token: ${{ secrets.CODECOV_TOKEN }}
113113
files: coverage.xml
@@ -156,7 +156,7 @@ jobs:
156156
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
157157
steps:
158158
- uses: actions/[email protected]
159-
- uses: actions/setup-python@v5
159+
- uses: actions/setup-python@v6
160160
if: ${{ matrix.python-version != '3.6' }}
161161
with:
162162
python-version: ${{ matrix.python-version }}
@@ -206,7 +206,7 @@ jobs:
206206
coverage xml
207207
- name: Upload coverage to Codecov
208208
if: ${{ !cancelled() }}
209-
uses: codecov/[email protected].0
209+
uses: codecov/[email protected].1
210210
with:
211211
token: ${{ secrets.CODECOV_TOKEN }}
212212
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4040
steps:
4141
- uses: actions/[email protected]
42-
- uses: actions/setup-python@v5
42+
- uses: actions/setup-python@v6
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
4545
python-version: ${{ matrix.python-version }}
@@ -79,7 +79,7 @@ jobs:
7979
coverage xml
8080
- name: Upload coverage to Codecov
8181
if: ${{ !cancelled() }}
82-
uses: codecov/[email protected].0
82+
uses: codecov/[email protected].1
8383
with:
8484
token: ${{ secrets.CODECOV_TOKEN }}
8585
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4040
steps:
4141
- uses: actions/[email protected]
42-
- uses: actions/setup-python@v5
42+
- uses: actions/setup-python@v6
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
4545
python-version: ${{ matrix.python-version }}
@@ -67,7 +67,7 @@ jobs:
6767
coverage xml
6868
- name: Upload coverage to Codecov
6969
if: ${{ !cancelled() }}
70-
uses: codecov/[email protected].0
70+
uses: codecov/[email protected].1
7171
with:
7272
token: ${{ secrets.CODECOV_TOKEN }}
7373
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4040
steps:
4141
- uses: actions/[email protected]
42-
- uses: actions/setup-python@v5
42+
- uses: actions/setup-python@v6
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
4545
python-version: ${{ matrix.python-version }}
@@ -79,7 +79,7 @@ jobs:
7979
coverage xml
8080
- name: Upload coverage to Codecov
8181
if: ${{ !cancelled() }}
82-
uses: codecov/[email protected].0
82+
uses: codecov/[email protected].1
8383
with:
8484
token: ${{ secrets.CODECOV_TOKEN }}
8585
files: coverage.xml

0 commit comments

Comments
 (0)