Skip to content

Commit 9e0b232

Browse files
sentrivanasentrivana
committed
Merge branch 'master' into ivana/toxgen/requests
2 parents f4b0ac7 + 222badb commit 9e0b232

File tree

6 files changed

+55
-282
lines changed

6 files changed

+55
-282
lines changed

‎.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-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.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

‎scripts/populate_tox/config.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,13 +277,33 @@
277277
"python": ">=3.9",
278278
"num_versions": 2,
279279
},
280+
"redis": {
281+
"package": "redis",
282+
"deps": {
283+
"*": ["fakeredis!=1.7.4", "pytest<8.0.0"],
284+
">=4.0,<5.0": ["fakeredis<2.31.0"],
285+
"py3.6,py3.7,py3.8": ["fakeredis<2.26.0"],
286+
"py3.7,py3.8,py3.9,py3.10,py3.11,py3.12,py3.13": ["pytest-asyncio"],
287+
},
288+
},
280289
"redis_py_cluster_legacy": {
281290
"package": "redis-py-cluster",
282291
},
283292
"requests": {
284293
"package": "requests",
285294
"num_versions": 2,
286295
},
296+
"rq": {
297+
"package": "rq",
298+
"deps": {
299+
# https://github.com/jamesls/fakeredis/issues/245
300+
# https://github.com/cunla/fakeredis-py/issues/341
301+
"*": ["fakeredis<2.28.0"],
302+
"<0.9": ["fakeredis<1.0", "redis<3.2.2"],
303+
">=0.9,<0.14": ["fakeredis>=1.0,<1.7.4"],
304+
"py3.6,py3.7": ["fakeredis!=2.26.0"],
305+
},
306+
},
287307
"sanic": {
288308
"package": "sanic",
289309
"deps": {

‎scripts/populate_tox/populate_tox.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@
6767
"gevent",
6868
"opentelemetry",
6969
"potel",
70-
# Integrations that can be migrated -- we should eventually remove all
71-
# of these from the IGNORE list
72-
"redis",
73-
"rq",
7470
}
7571

7672

‎scripts/populate_tox/tox.jinja‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,6 @@ envlist =
5454
# OpenTelemetry Experimental (POTel)
5555
{py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-potel
5656

57-
# Redis
58-
{py3.6,py3.8}-redis-v{3}
59-
{py3.7,py3.8,py3.11}-redis-v{4}
60-
{py3.7,py3.11,py3.12}-redis-v{5}
61-
{py3.7,py3.12,py3.13}-redis-latest
62-
63-
# RQ (Redis Queue)
64-
{py3.6}-rq-v{0.6}
65-
{py3.6,py3.9}-rq-v{0.13,1.0}
66-
{py3.6,py3.11}-rq-v{1.5,1.10}
67-
{py3.7,py3.11,py3.12}-rq-v{1.15,1.16}
68-
{py3.7,py3.12,py3.13}-rq-latest
69-
7057
# === Integrations - Auto-generated ===
7158
# These come from the populate_tox.py script. Eventually we should move all
7259
# integration tests there.
@@ -133,35 +120,6 @@ deps =
133120
# OpenTelemetry Experimental (POTel)
134121
potel: -e .[opentelemetry-experimental]
135122
136-
# Redis
137-
redis: fakeredis!=1.7.4
138-
redis: pytest<8.0.0
139-
{py3.6,py3.7,py3.8}-redis: fakeredis<2.26.0
140-
{py3.7,py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-redis: pytest-asyncio
141-
redis-v3: redis~=3.0
142-
redis-v4: redis~=4.0
143-
redis-v4: fakeredis<2.31.0
144-
redis-v5: redis~=5.0
145-
redis-latest: redis
146-
147-
# RQ (Redis Queue)
148-
# https://github.com/jamesls/fakeredis/issues/245
149-
rq-v{0.6}: fakeredis<1.0
150-
rq-v{0.6}: redis<3.2.2
151-
rq-v{0.13,1.0,1.5,1.10}: fakeredis>=1.0,<1.7.4
152-
rq-v{1.15,1.16}: fakeredis<2.28.0
153-
{py3.6,py3.7}-rq-v{1.15,1.16}: fakeredis!=2.26.0 # https://github.com/cunla/fakeredis-py/issues/341
154-
rq-latest: fakeredis<2.28.0
155-
{py3.6,py3.7}-rq-latest: fakeredis!=2.26.0 # https://github.com/cunla/fakeredis-py/issues/341
156-
rq-v0.6: rq~=0.6.0
157-
rq-v0.13: rq~=0.13.0
158-
rq-v1.0: rq~=1.0.0
159-
rq-v1.5: rq~=1.5.0
160-
rq-v1.10: rq~=1.10.0
161-
rq-v1.15: rq~=1.15.0
162-
rq-v1.16: rq~=1.16.0
163-
rq-latest: rq
164-
165123
# === Integrations - Auto-generated ===
166124
# These come from the populate_tox.py script. Eventually we should move all
167125
# integration tests there.

0 commit comments

Comments
 (0)