Skip to content

Commit 0d0551c

Browse files
committed
Merge branch 'master' into potel-base
2 parents fc8fa9f + 3b28649 commit 0d0551c

21 files changed

+148
-201
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
37+
if: ${{ matrix.python-version != '3.6' }}
3738
with:
3839
python-version: ${{ matrix.python-version }}
3940
allow-prereleases: true
@@ -96,6 +97,7 @@ jobs:
9697
steps:
9798
- uses: actions/[email protected]
9899
- uses: actions/setup-python@v5
100+
if: ${{ matrix.python-version != '3.6' }}
99101
with:
100102
python-version: ${{ matrix.python-version }}
101103
allow-prereleases: true
@@ -151,7 +153,7 @@ jobs:
151153
needs: test-ai-pinned
152154
# Always run this, even if a dependent job failed
153155
if: always()
154-
runs-on: ubuntu-20.04
156+
runs-on: ubuntu-22.04
155157
steps:
156158
- name: Check for failures
157159
if: contains(needs.test-ai-pinned.result, 'failure') || contains(needs.test-ai-pinned.result, 'skipped')

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ jobs:
3535
docker:
3636
image: docker:dind # Required for Docker network management
3737
options: --privileged # Required for Docker-in-Docker operations
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
@@ -101,9 +104,12 @@ jobs:
101104
docker:
102105
image: docker:dind # Required for Docker network management
103106
options: --privileged # Required for Docker-in-Docker operations
107+
# Use Docker container only for Python 3.6
108+
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
104109
steps:
105110
- uses: actions/[email protected]
106111
- uses: actions/setup-python@v5
112+
if: ${{ matrix.python-version != '3.6' }}
107113
with:
108114
python-version: ${{ matrix.python-version }}
109115
allow-prereleases: true
@@ -159,7 +165,7 @@ jobs:
159165
needs: test-cloud-pinned
160166
# Always run this, even if a dependent job failed
161167
if: always()
162-
runs-on: ubuntu-20.04
168+
runs-on: ubuntu-22.04
163169
steps:
164170
- name: Check for failures
165171
if: contains(needs.test-cloud-pinned.result, 'failure') || contains(needs.test-cloud-pinned.result, 'skipped')

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
37+
if: ${{ matrix.python-version != '3.6' }}
3738
with:
3839
python-version: ${{ matrix.python-version }}
3940
allow-prereleases: true
@@ -73,7 +74,7 @@ jobs:
7374
needs: test-common-pinned
7475
# Always run this, even if a dependent job failed
7576
if: always()
76-
runs-on: ubuntu-20.04
77+
runs-on: ubuntu-22.04
7778
steps:
7879
- name: Check for failures
7980
if: contains(needs.test-common-pinned.result, 'failure') || contains(needs.test-common-pinned.result, 'skipped')

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

Lines changed: 1 addition & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -31,175 +31,7 @@ jobs:
3131
matrix:
3232
python-version: ["3.7","3.8","3.11","3.12","3.13"]
3333
os: [ubuntu-22.04]
34-
services:
35-
postgres:
36-
image: postgres
37-
env:
38-
POSTGRES_PASSWORD: sentry
39-
# Set health checks to wait until postgres has started
40-
options: >-
41-
--health-cmd pg_isready
42-
--health-interval 10s
43-
--health-timeout 5s
44-
--health-retries 5
45-
# Maps tcp port 5432 on service container to the host
46-
ports:
47-
- 5432:5432
48-
env:
49-
SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
50-
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
51-
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
52-
steps:
53-
- uses: actions/[email protected]
54-
- uses: actions/setup-python@v5
55-
with:
56-
python-version: ${{ matrix.python-version }}
57-
allow-prereleases: true
58-
- name: "Setup ClickHouse Server"
59-
uses: getsentry/[email protected]
60-
- name: Setup Test Env
61-
run: |
62-
pip install "coverage[toml]" tox
63-
- name: Erase coverage
64-
run: |
65-
coverage erase
66-
- name: Test asyncpg latest
67-
run: |
68-
set -x # print commands that are executed
69-
./scripts/runtox.sh "py${{ matrix.python-version }}-asyncpg-latest"
70-
- name: Test clickhouse_driver latest
71-
run: |
72-
set -x # print commands that are executed
73-
./scripts/runtox.sh "py${{ matrix.python-version }}-clickhouse_driver-latest"
74-
- name: Test pymongo latest
75-
run: |
76-
set -x # print commands that are executed
77-
./scripts/runtox.sh "py${{ matrix.python-version }}-pymongo-latest"
78-
- name: Test redis latest
79-
run: |
80-
set -x # print commands that are executed
81-
./scripts/runtox.sh "py${{ matrix.python-version }}-redis-latest"
82-
- name: Test redis_py_cluster_legacy latest
83-
run: |
84-
set -x # print commands that are executed
85-
./scripts/runtox.sh "py${{ matrix.python-version }}-redis_py_cluster_legacy-latest"
86-
- name: Test sqlalchemy latest
87-
run: |
88-
set -x # print commands that are executed
89-
./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
90-
- name: Generate coverage XML
91-
if: ${{ !cancelled() }}
92-
run: |
93-
coverage combine .coverage-sentry-*
94-
coverage xml
95-
- name: Upload coverage to Codecov
96-
if: ${{ !cancelled() }}
97-
uses: codecov/[email protected]
98-
with:
99-
token: ${{ secrets.CODECOV_TOKEN }}
100-
files: coverage.xml
101-
# make sure no plugins alter our coverage reports
102-
plugin: noop
103-
verbose: true
104-
- name: Upload test results to Codecov
105-
if: ${{ !cancelled() }}
106-
uses: codecov/test-results-action@v1
107-
with:
108-
token: ${{ secrets.CODECOV_TOKEN }}
109-
files: .junitxml
110-
verbose: true
111-
test-dbs-pinned:
112-
name: DBs (pinned)
113-
timeout-minutes: 30
114-
runs-on: ${{ matrix.os }}
115-
strategy:
116-
fail-fast: false
117-
matrix:
118-
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
119-
os: [ubuntu-22.04]
120-
services:
121-
postgres:
122-
image: postgres
123-
env:
124-
POSTGRES_PASSWORD: sentry
125-
# Set health checks to wait until postgres has started
126-
options: >-
127-
--health-cmd pg_isready
128-
--health-interval 10s
129-
--health-timeout 5s
130-
--health-retries 5
131-
# Maps tcp port 5432 on service container to the host
132-
ports:
133-
- 5432:5432
134-
env:
135-
SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
136-
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
137-
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
138-
steps:
139-
- uses: actions/[email protected]
140-
- uses: actions/setup-python@v5
141-
with:
142-
python-version: ${{ matrix.python-version }}
143-
allow-prereleases: true
144-
- name: "Setup ClickHouse Server"
145-
uses: getsentry/[email protected]
146-
- name: Setup Test Env
147-
run: |
148-
pip install "coverage[toml]" tox
149-
- name: Erase coverage
150-
run: |
151-
coverage erase
152-
- name: Test asyncpg pinned
153-
run: |
154-
set -x # print commands that are executed
155-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-asyncpg"
156-
- name: Test clickhouse_driver pinned
157-
run: |
158-
set -x # print commands that are executed
159-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-clickhouse_driver"
160-
- name: Test pymongo pinned
161-
run: |
162-
set -x # print commands that are executed
163-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-pymongo"
164-
- name: Test redis pinned
165-
run: |
166-
set -x # print commands that are executed
167-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-redis"
168-
- name: Test redis_py_cluster_legacy pinned
169-
run: |
170-
set -x # print commands that are executed
171-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-redis_py_cluster_legacy"
172-
- name: Test sqlalchemy pinned
173-
run: |
174-
set -x # print commands that are executed
175-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-sqlalchemy"
176-
- name: Generate coverage XML
177-
if: ${{ !cancelled() }}
178-
run: |
179-
coverage combine .coverage-sentry-*
180-
coverage xml
181-
- name: Upload coverage to Codecov
182-
if: ${{ !cancelled() }}
183-
uses: codecov/[email protected]
184-
with:
185-
token: ${{ secrets.CODECOV_TOKEN }}
186-
files: coverage.xml
187-
# make sure no plugins alter our coverage reports
188-
plugin: noop
189-
verbose: true
190-
- name: Upload test results to Codecov
191-
if: ${{ !cancelled() }}
192-
uses: codecov/test-results-action@v1
193-
with:
194-
token: ${{ secrets.CODECOV_TOKEN }}
195-
files: .junitxml
196-
verbose: true
197-
check_required_tests:
198-
name: All pinned DBs tests passed
199-
needs: test-dbs-pinned
200-
# Always run this, even if a dependent job failed
201-
if: always()
202-
runs-on: ubuntu-20.04
34+
container: ${{ (matrix.python-version == '3.6' || matrix.python-version == '3.7') && 'python:${{ matrix.python-version }}' || null }}
20335
steps:
20436
- name: Check for failures
20537
if: contains(needs.test-dbs-pinned.result, 'failure') || contains(needs.test-dbs-pinned.result, 'skipped')

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
37+
if: ${{ matrix.python-version != '3.6' }}
3738
with:
3839
python-version: ${{ matrix.python-version }}
3940
allow-prereleases: true
@@ -85,7 +86,7 @@ jobs:
8586
needs: test-flags-pinned
8687
# Always run this, even if a dependent job failed
8788
if: always()
88-
runs-on: ubuntu-20.04
89+
runs-on: ubuntu-22.04
8990
steps:
9091
- name: Check for failures
9192
if: contains(needs.test-flags-pinned.result, 'failure') || contains(needs.test-flags-pinned.result, 'skipped')

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
37+
if: ${{ matrix.python-version != '3.6' }}
3738
with:
3839
python-version: ${{ matrix.python-version }}
3940
allow-prereleases: true
@@ -73,7 +74,7 @@ jobs:
7374
needs: test-gevent-pinned
7475
# Always run this, even if a dependent job failed
7576
if: always()
76-
runs-on: ubuntu-20.04
77+
runs-on: ubuntu-22.04
7778
steps:
7879
- name: Check for failures
7980
if: contains(needs.test-gevent-pinned.result, 'failure') || contains(needs.test-gevent-pinned.result, 'skipped')

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
37+
if: ${{ matrix.python-version != '3.6' }}
3738
with:
3839
python-version: ${{ matrix.python-version }}
3940
allow-prereleases: true
@@ -85,7 +86,7 @@ jobs:
8586
needs: test-graphql-pinned
8687
# Always run this, even if a dependent job failed
8788
if: always()
88-
runs-on: ubuntu-20.04
89+
runs-on: ubuntu-22.04
8990
steps:
9091
- name: Check for failures
9192
if: contains(needs.test-graphql-pinned.result, 'failure') || contains(needs.test-graphql-pinned.result, 'skipped')

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
37+
if: ${{ matrix.python-version != '3.6' }}
3738
with:
3839
python-version: ${{ matrix.python-version }}
3940
allow-prereleases: true
@@ -93,7 +94,7 @@ jobs:
9394
needs: test-misc-pinned
9495
# Always run this, even if a dependent job failed
9596
if: always()
96-
runs-on: ubuntu-20.04
97+
runs-on: ubuntu-22.04
9798
steps:
9899
- name: Check for failures
99100
if: contains(needs.test-misc-pinned.result, 'failure') || contains(needs.test-misc-pinned.result, 'skipped')

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
37+
if: ${{ matrix.python-version != '3.6' }}
3738
with:
3839
python-version: ${{ matrix.python-version }}
3940
allow-prereleases: true
@@ -88,6 +89,7 @@ jobs:
8889
steps:
8990
- uses: actions/[email protected]
9091
- uses: actions/setup-python@v5
92+
if: ${{ matrix.python-version != '3.6' }}
9193
with:
9294
python-version: ${{ matrix.python-version }}
9395
allow-prereleases: true
@@ -135,7 +137,7 @@ jobs:
135137
needs: test-network-pinned
136138
# Always run this, even if a dependent job failed
137139
if: always()
138-
runs-on: ubuntu-20.04
140+
runs-on: ubuntu-22.04
139141
steps:
140142
- name: Check for failures
141143
if: contains(needs.test-network-pinned.result, 'failure') || contains(needs.test-network-pinned.result, 'skipped')

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/[email protected]
3636
- uses: actions/setup-python@v5
37+
if: ${{ matrix.python-version != '3.6' }}
3738
with:
3839
python-version: ${{ matrix.python-version }}
3940
allow-prereleases: true
@@ -110,6 +111,7 @@ jobs:
110111
steps:
111112
- uses: actions/[email protected]
112113
- uses: actions/setup-python@v5
114+
if: ${{ matrix.python-version != '3.6' }}
113115
with:
114116
python-version: ${{ matrix.python-version }}
115117
allow-prereleases: true
@@ -179,7 +181,7 @@ jobs:
179181
needs: test-tasks-pinned
180182
# Always run this, even if a dependent job failed
181183
if: always()
182-
runs-on: ubuntu-20.04
184+
runs-on: ubuntu-22.04
183185
steps:
184186
- name: Check for failures
185187
if: contains(needs.test-tasks-pinned.result, 'failure') || contains(needs.test-tasks-pinned.result, 'skipped')

0 commit comments

Comments
 (0)