Skip to content

Commit a41b477

Browse files
IgrehIgreh
authored
Merge branch 'master' into feat-dramatiq-transaction-support
2 parents 39e3a50 + 97a5c08 commit a41b477

28 files changed

+749
-785
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/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-dbs.yml‎

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -22,105 +22,6 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-dbs-latest:
26-
name: DBs (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.7","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-22.04]
38-
services:
39-
postgres:
40-
image: postgres
41-
env:
42-
POSTGRES_PASSWORD: sentry
43-
# Set health checks to wait until postgres has started
44-
options: >-
45-
--health-cmd pg_isready
46-
--health-interval 10s
47-
--health-timeout 5s
48-
--health-retries 5
49-
# Maps tcp port 5432 on service container to the host
50-
ports:
51-
- 5432:5432
52-
env:
53-
SENTRY_PYTHON_TEST_POSTGRES_HOST: ${{ matrix.python-version == '3.6' && 'postgres' || 'localhost' }}
54-
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
55-
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 }}
58-
steps:
59-
- uses: actions/[email protected]
60-
- uses: actions/setup-python@v6
61-
if: ${{ matrix.python-version != '3.6' }}
62-
with:
63-
python-version: ${{ matrix.python-version }}
64-
allow-prereleases: true
65-
- name: "Setup ClickHouse Server"
66-
uses: getsentry/[email protected]
67-
- name: Setup Test Env
68-
run: |
69-
pip install "coverage[toml]" tox
70-
- name: Erase coverage
71-
run: |
72-
coverage erase
73-
- name: Test asyncpg latest
74-
run: |
75-
set -x # print commands that are executed
76-
./scripts/runtox.sh "py${{ matrix.python-version }}-asyncpg-latest"
77-
- name: Test clickhouse_driver latest
78-
run: |
79-
set -x # print commands that are executed
80-
./scripts/runtox.sh "py${{ matrix.python-version }}-clickhouse_driver-latest"
81-
- name: Test pymongo latest
82-
run: |
83-
set -x # print commands that are executed
84-
./scripts/runtox.sh "py${{ matrix.python-version }}-pymongo-latest"
85-
- name: Test redis latest
86-
run: |
87-
set -x # print commands that are executed
88-
./scripts/runtox.sh "py${{ matrix.python-version }}-redis-latest"
89-
- name: Test redis_py_cluster_legacy latest
90-
run: |
91-
set -x # print commands that are executed
92-
./scripts/runtox.sh "py${{ matrix.python-version }}-redis_py_cluster_legacy-latest"
93-
- name: Test sqlalchemy latest
94-
run: |
95-
set -x # print commands that are executed
96-
./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
97-
- name: Generate coverage XML (Python 3.6)
98-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
99-
run: |
100-
export COVERAGE_RCFILE=.coveragerc36
101-
coverage combine .coverage-sentry-*
102-
coverage xml --ignore-errors
103-
- name: Generate coverage XML
104-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
105-
run: |
106-
coverage combine .coverage-sentry-*
107-
coverage xml
108-
- name: Upload coverage to Codecov
109-
if: ${{ !cancelled() }}
110-
uses: codecov/[email protected]
111-
with:
112-
token: ${{ secrets.CODECOV_TOKEN }}
113-
files: coverage.xml
114-
# make sure no plugins alter our coverage reports
115-
plugins: noop
116-
verbose: true
117-
- name: Upload test results to Codecov
118-
if: ${{ !cancelled() }}
119-
uses: codecov/test-results-action@v1
120-
with:
121-
token: ${{ secrets.CODECOV_TOKEN }}
122-
files: .junitxml
123-
verbose: true
12425
test-dbs-pinned:
12526
name: DBs (pinned)
12627
timeout-minutes: 30

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

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -22,73 +22,6 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-network-latest:
26-
name: Network (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.9","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
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 }}
40-
steps:
41-
- uses: actions/[email protected]
42-
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
44-
with:
45-
python-version: ${{ matrix.python-version }}
46-
allow-prereleases: true
47-
- name: Setup Test Env
48-
run: |
49-
pip install "coverage[toml]" tox
50-
- name: Erase coverage
51-
run: |
52-
coverage erase
53-
- name: Test grpc latest
54-
run: |
55-
set -x # print commands that are executed
56-
./scripts/runtox.sh "py${{ matrix.python-version }}-grpc-latest"
57-
- name: Test httpx latest
58-
run: |
59-
set -x # print commands that are executed
60-
./scripts/runtox.sh "py${{ matrix.python-version }}-httpx-latest"
61-
- name: Test requests latest
62-
run: |
63-
set -x # print commands that are executed
64-
./scripts/runtox.sh "py${{ matrix.python-version }}-requests-latest"
65-
- name: Generate coverage XML (Python 3.6)
66-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
67-
run: |
68-
export COVERAGE_RCFILE=.coveragerc36
69-
coverage combine .coverage-sentry-*
70-
coverage xml --ignore-errors
71-
- name: Generate coverage XML
72-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
73-
run: |
74-
coverage combine .coverage-sentry-*
75-
coverage xml
76-
- name: Upload coverage to Codecov
77-
if: ${{ !cancelled() }}
78-
uses: codecov/[email protected]
79-
with:
80-
token: ${{ secrets.CODECOV_TOKEN }}
81-
files: coverage.xml
82-
# make sure no plugins alter our coverage reports
83-
plugins: noop
84-
verbose: true
85-
- name: Upload test results to Codecov
86-
if: ${{ !cancelled() }}
87-
uses: codecov/test-results-action@v1
88-
with:
89-
token: ${{ secrets.CODECOV_TOKEN }}
90-
files: .junitxml
91-
verbose: true
9225
test-network-pinned:
9326
name: Network (pinned)
9427
timeout-minutes: 30

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

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -22,100 +22,6 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-tasks-latest:
26-
name: Tasks (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.7","3.10","3.11","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
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 }}
40-
steps:
41-
- uses: actions/[email protected]
42-
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
44-
with:
45-
python-version: ${{ matrix.python-version }}
46-
allow-prereleases: true
47-
- name: Start Redis
48-
uses: supercharge/[email protected]
49-
- name: Install Java
50-
uses: actions/setup-java@v5
51-
with:
52-
distribution: 'temurin'
53-
java-version: '21'
54-
- name: Setup Test Env
55-
run: |
56-
pip install "coverage[toml]" tox
57-
- name: Erase coverage
58-
run: |
59-
coverage erase
60-
- name: Test arq latest
61-
run: |
62-
set -x # print commands that are executed
63-
./scripts/runtox.sh "py${{ matrix.python-version }}-arq-latest"
64-
- name: Test beam latest
65-
run: |
66-
set -x # print commands that are executed
67-
./scripts/runtox.sh "py${{ matrix.python-version }}-beam-latest"
68-
- name: Test celery latest
69-
run: |
70-
set -x # print commands that are executed
71-
./scripts/runtox.sh "py${{ matrix.python-version }}-celery-latest"
72-
- name: Test dramatiq latest
73-
run: |
74-
set -x # print commands that are executed
75-
./scripts/runtox.sh "py${{ matrix.python-version }}-dramatiq-latest"
76-
- name: Test huey latest
77-
run: |
78-
set -x # print commands that are executed
79-
./scripts/runtox.sh "py${{ matrix.python-version }}-huey-latest"
80-
- name: Test ray latest
81-
run: |
82-
set -x # print commands that are executed
83-
./scripts/runtox.sh "py${{ matrix.python-version }}-ray-latest"
84-
- name: Test rq latest
85-
run: |
86-
set -x # print commands that are executed
87-
./scripts/runtox.sh "py${{ matrix.python-version }}-rq-latest"
88-
- name: Test spark latest
89-
run: |
90-
set -x # print commands that are executed
91-
./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest"
92-
- name: Generate coverage XML (Python 3.6)
93-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
94-
run: |
95-
export COVERAGE_RCFILE=.coveragerc36
96-
coverage combine .coverage-sentry-*
97-
coverage xml --ignore-errors
98-
- name: Generate coverage XML
99-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
100-
run: |
101-
coverage combine .coverage-sentry-*
102-
coverage xml
103-
- name: Upload coverage to Codecov
104-
if: ${{ !cancelled() }}
105-
uses: codecov/[email protected]
106-
with:
107-
token: ${{ secrets.CODECOV_TOKEN }}
108-
files: coverage.xml
109-
# make sure no plugins alter our coverage reports
110-
plugins: noop
111-
verbose: true
112-
- name: Upload test results to Codecov
113-
if: ${{ !cancelled() }}
114-
uses: codecov/test-results-action@v1
115-
with:
116-
token: ${{ secrets.CODECOV_TOKEN }}
117-
files: .junitxml
118-
verbose: true
11925
test-tasks-pinned:
12026
name: Tasks (pinned)
12127
timeout-minutes: 30

0 commit comments

Comments
 (0)