Skip to content

Commit 1666c9d

Browse files
committed
Merge branch 'potel-base' into potel-base-run-all-tests
2 parents ecce841 + afe6491 commit 1666c9d

File tree

189 files changed

+8634
-4136
lines changed

Some content is hidden

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

189 files changed

+8634
-4136
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
os: [ubuntu-22.04]
3434
steps:
3535
- uses: actions/[email protected]
@@ -75,7 +75,7 @@ jobs:
7575
coverage xml
7676
- name: Upload coverage to Codecov
7777
if: ${{ !cancelled() }}
78-
uses: codecov/codecov-action@v5.1.2
78+
uses: codecov/codecov-action@v5.4.0
7979
with:
8080
token: ${{ secrets.CODECOV_TOKEN }}
8181
files: coverage.xml
@@ -96,7 +96,7 @@ jobs:
9696
strategy:
9797
fail-fast: false
9898
matrix:
99-
python-version: ["3.8","3.9","3.11","3.12","3.13"]
99+
python-version: ["3.8","3.9","3.11","3.12"]
100100
os: [ubuntu-22.04]
101101
steps:
102102
- uses: actions/[email protected]
@@ -142,7 +142,7 @@ jobs:
142142
coverage xml
143143
- name: Upload coverage to Codecov
144144
if: ${{ !cancelled() }}
145-
uses: codecov/codecov-action@v5.1.2
145+
uses: codecov/codecov-action@v5.4.0
146146
with:
147147
token: ${{ secrets.CODECOV_TOKEN }}
148148
files: coverage.xml

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
coverage xml
9191
- name: Upload coverage to Codecov
9292
if: ${{ !cancelled() }}
93-
uses: codecov/codecov-action@v5.1.2
93+
uses: codecov/codecov-action@v5.3.1
9494
with:
9595
token: ${{ secrets.CODECOV_TOKEN }}
9696
files: coverage.xml

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
matrix:
3232
python-version: ["3.8","3.11","3.12","3.13"]
3333
os: [ubuntu-22.04]
34+
services:
35+
docker:
36+
image: docker:dind # Required for Docker network management
37+
options: --privileged # Required for Docker-in-Docker operations
3438
steps:
3539
- uses: actions/[email protected]
3640
- uses: actions/setup-python@v5
@@ -43,6 +47,11 @@ jobs:
4347
- name: Erase coverage
4448
run: |
4549
coverage erase
50+
- name: Test aws_lambda latest
51+
if: ${{ !cancelled() }}
52+
run: |
53+
set -x # print commands that are executed
54+
./scripts/runtox.sh "py${{ matrix.python-version }}-aws_lambda-latest"
4655
- name: Test boto3 latest
4756
if: ${{ !cancelled() }}
4857
run: |
@@ -70,7 +79,7 @@ jobs:
7079
coverage xml
7180
- name: Upload coverage to Codecov
7281
if: ${{ !cancelled() }}
73-
uses: codecov/codecov-action@v5.1.2
82+
uses: codecov/codecov-action@v5.4.0
7483
with:
7584
token: ${{ secrets.CODECOV_TOKEN }}
7685
files: coverage.xml
@@ -91,8 +100,12 @@ jobs:
91100
strategy:
92101
fail-fast: false
93102
matrix:
94-
python-version: ["3.7","3.9","3.11","3.12","3.13"]
103+
python-version: ["3.7","3.8","3.9","3.11","3.12","3.13"]
95104
os: [ubuntu-22.04]
105+
services:
106+
docker:
107+
image: docker:dind # Required for Docker network management
108+
options: --privileged # Required for Docker-in-Docker operations
96109
steps:
97110
- uses: actions/[email protected]
98111
- uses: actions/setup-python@v5
@@ -105,6 +118,11 @@ jobs:
105118
- name: Erase coverage
106119
run: |
107120
coverage erase
121+
- name: Test aws_lambda pinned
122+
if: ${{ !cancelled() }}
123+
run: |
124+
set -x # print commands that are executed
125+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
108126
- name: Test boto3 pinned
109127
if: ${{ !cancelled() }}
110128
run: |
@@ -132,7 +150,7 @@ jobs:
132150
coverage xml
133151
- name: Upload coverage to Codecov
134152
if: ${{ !cancelled() }}
135-
uses: codecov/codecov-action@v5.1.2
153+
uses: codecov/codecov-action@v5.4.0
136154
with:
137155
token: ${{ secrets.CODECOV_TOKEN }}
138156
files: coverage.xml

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
coverage xml
5656
- name: Upload coverage to Codecov
5757
if: ${{ !cancelled() }}
58-
uses: codecov/codecov-action@v5.1.2
58+
uses: codecov/codecov-action@v5.4.0
5959
with:
6060
token: ${{ secrets.CODECOV_TOKEN }}
6161
files: coverage.xml

0 commit comments

Comments
 (0)