Skip to content

Commit 6ef2e19

Browse files
sentrivanasentrivana
committed
aiohttp, trytond
1 parent b17e51d commit 6ef2e19

File tree

5 files changed

+28
-138
lines changed

5 files changed

+28
-138
lines changed

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

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -22,82 +22,6 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-misc-latest:
26-
name: Misc (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.8","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-20.04]
38-
steps:
39-
- uses: actions/[email protected]
40-
- uses: actions/setup-python@v5
41-
with:
42-
python-version: ${{ matrix.python-version }}
43-
allow-prereleases: true
44-
- name: Setup Test Env
45-
run: |
46-
pip install "coverage[toml]" tox
47-
- name: Erase coverage
48-
run: |
49-
coverage erase
50-
- name: Test loguru latest
51-
run: |
52-
set -x # print commands that are executed
53-
./scripts/runtox.sh "py${{ matrix.python-version }}-loguru-latest"
54-
- name: Test opentelemetry latest
55-
run: |
56-
set -x # print commands that are executed
57-
./scripts/runtox.sh "py${{ matrix.python-version }}-opentelemetry-latest"
58-
- name: Test potel latest
59-
run: |
60-
set -x # print commands that are executed
61-
./scripts/runtox.sh "py${{ matrix.python-version }}-potel-latest"
62-
- name: Test pure_eval latest
63-
run: |
64-
set -x # print commands that are executed
65-
./scripts/runtox.sh "py${{ matrix.python-version }}-pure_eval-latest"
66-
- name: Test trytond latest
67-
run: |
68-
set -x # print commands that are executed
69-
./scripts/runtox.sh "py${{ matrix.python-version }}-trytond-latest"
70-
- name: Test typer latest
71-
run: |
72-
set -x # print commands that are executed
73-
./scripts/runtox.sh "py${{ matrix.python-version }}-typer-latest"
74-
- name: Generate coverage XML (Python 3.6)
75-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
76-
run: |
77-
export COVERAGE_RCFILE=.coveragerc36
78-
coverage combine .coverage-sentry-*
79-
coverage xml --ignore-errors
80-
- name: Generate coverage XML
81-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
82-
run: |
83-
coverage combine .coverage-sentry-*
84-
coverage xml
85-
- name: Upload coverage to Codecov
86-
if: ${{ !cancelled() }}
87-
uses: codecov/[email protected]
88-
with:
89-
token: ${{ secrets.CODECOV_TOKEN }}
90-
files: coverage.xml
91-
# make sure no plugins alter our coverage reports
92-
plugin: noop
93-
verbose: true
94-
- name: Upload test results to Codecov
95-
if: ${{ !cancelled() }}
96-
uses: codecov/test-results-action@v1
97-
with:
98-
token: ${{ secrets.CODECOV_TOKEN }}
99-
files: .junitxml
100-
verbose: true
10125
test-misc-pinned:
10226
name: Misc (pinned)
10327
timeout-minutes: 30

‎scripts/populate_tox/config.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@
180180
"deps": {
181181
"*": ["protobuf", "mypy-protobuf", "types-protobuf", "pytest-asyncio"],
182182
},
183+
"python": ">=3.7",
183184
},
184185
"httpx": {
185186
"package": "httpx",

‎scripts/populate_tox/populate_tox.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
# suites over to this script. Some entries will probably stay forever
4545
# as they don't fit the mold (e.g. common, asgi, which don't have a 3rd party
4646
# pypi package to install in different versions).
47-
"aiohttp",
4847
"anthropic",
4948
"arq",
5049
"asgi",
@@ -74,7 +73,6 @@
7473
"redis",
7574
"rq",
7675
"sanic",
77-
"trytond",
7876
}
7977

8078

‎scripts/populate_tox/tox.jinja‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ envlist =
3131
# At a minimum, we should test against at least the lowest
3232
# and the latest supported version of a framework.
3333

34-
# AIOHTTP
35-
{py3.7}-aiohttp-v{3.4}
36-
{py3.7,py3.9,py3.11}-aiohttp-v{3.8}
37-
{py3.8,py3.12,py3.13}-aiohttp-latest
38-
3934
# Anthropic
4035
{py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40}
4136
{py3.7,py3.11,py3.12}-anthropic-latest
@@ -163,13 +158,6 @@ envlist =
163158
{py3.8,py3.11,py3.12}-sanic-v{24.6}
164159
{py3.9,py3.12,py3.13}-sanic-latest
165160

166-
# Trytond
167-
{py3.6}-trytond-v{4}
168-
{py3.6,py3.8}-trytond-v{5}
169-
{py3.6,py3.11}-trytond-v{6}
170-
{py3.8,py3.11,py3.12}-trytond-v{7}
171-
{py3.8,py3.12,py3.13}-trytond-latest
172-
173161
# === Integrations - Auto-generated ===
174162
# These come from the populate_tox.py script. Eventually we should move all
175163
# integration tests there.
@@ -215,14 +203,6 @@ deps =
215203
216204
# === Integrations ===
217205
218-
# AIOHTTP
219-
aiohttp-v3.4: aiohttp~=3.4.0
220-
aiohttp-v3.8: aiohttp~=3.8.0
221-
aiohttp-latest: aiohttp
222-
aiohttp: pytest-aiohttp
223-
aiohttp-v3.8: pytest-asyncio
224-
aiohttp-latest: pytest-asyncio
225-
226206
# Anthropic
227207
anthropic: pytest-asyncio
228208
anthropic-v{0.16,0.28}: httpx<0.28.0
@@ -434,15 +414,6 @@ deps =
434414
sanic-v24.6: sanic~=24.6.0
435415
sanic-latest: sanic
436416
437-
# Trytond
438-
trytond: werkzeug
439-
trytond-v4: werkzeug<1.0
440-
trytond-v4: trytond~=4.0
441-
trytond-v5: trytond~=5.0
442-
trytond-v6: trytond~=6.0
443-
trytond-v7: trytond~=7.0
444-
trytond-latest: trytond
445-
446417
# === Integrations - Auto-generated ===
447418
# These come from the populate_tox.py script. Eventually we should move all
448419
# integration tests there.

‎tox.ini‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ envlist =
3131
# At a minimum, we should test against at least the lowest
3232
# and the latest supported version of a framework.
3333

34-
# AIOHTTP
35-
{py3.7}-aiohttp-v{3.4}
36-
{py3.7,py3.9,py3.11}-aiohttp-v{3.8}
37-
{py3.8,py3.12,py3.13}-aiohttp-latest
38-
3934
# Anthropic
4035
{py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40}
4136
{py3.7,py3.11,py3.12}-anthropic-latest
@@ -163,13 +158,6 @@ envlist =
163158
{py3.8,py3.11,py3.12}-sanic-v{24.6}
164159
{py3.9,py3.12,py3.13}-sanic-latest
165160

166-
# Trytond
167-
{py3.6}-trytond-v{4}
168-
{py3.6,py3.8}-trytond-v{5}
169-
{py3.6,py3.11}-trytond-v{6}
170-
{py3.8,py3.11,py3.12}-trytond-v{7}
171-
{py3.8,py3.12,py3.13}-trytond-latest
172-
173161
# === Integrations - Auto-generated ===
174162
# These come from the populate_tox.py script. Eventually we should move all
175163
# integration tests there.
@@ -225,8 +213,8 @@ envlist =
225213

226214

227215
# ~~~ Network ~~~
228-
{py3.6,py3.7,py3.8}-grpc-v1.32.0
229-
{py3.6,py3.9,py3.10}-grpc-v1.44.0
216+
{py3.7,py3.8}-grpc-v1.32.0
217+
{py3.7,py3.9,py3.10}-grpc-v1.44.0
230218
{py3.7,py3.10,py3.11}-grpc-v1.58.3
231219
{py3.8,py3.12,py3.13}-grpc-v1.69.0
232220

@@ -270,6 +258,11 @@ envlist =
270258

271259

272260
# ~~~ Web 2 ~~~
261+
{py3.7}-aiohttp-v3.6.3
262+
{py3.7,py3.9,py3.10}-aiohttp-v3.8.6
263+
{py3.8,py3.12,py3.13}-aiohttp-v3.10.9
264+
{py3.9,py3.12,py3.13}-aiohttp-v3.11.11
265+
273266
{py3.6,py3.7}-bottle-v0.12.25
274267
{py3.6,py3.8,py3.9}-bottle-v0.13.2
275268

@@ -296,6 +289,12 @@ envlist =
296289
{py3.6,py3.9,py3.10}-loguru-v0.6.0
297290
{py3.6,py3.12,py3.13}-loguru-v0.7.3
298291

292+
{py3.6,py3.7}-trytond-v5.0.63
293+
{py3.6,py3.7,py3.8}-trytond-v5.8.16
294+
{py3.8,py3.10,py3.11}-trytond-v6.8.17
295+
{py3.8,py3.11,py3.12}-trytond-v7.0.9
296+
{py3.8,py3.11,py3.12}-trytond-v7.4.4
297+
299298
{py3.7,py3.11,py3.12}-typer-v0.15.1
300299

301300

@@ -330,14 +329,6 @@ deps =
330329

331330
# === Integrations ===
332331

333-
# AIOHTTP
334-
aiohttp-v3.4: aiohttp~=3.4.0
335-
aiohttp-v3.8: aiohttp~=3.8.0
336-
aiohttp-latest: aiohttp
337-
aiohttp: pytest-aiohttp
338-
aiohttp-v3.8: pytest-asyncio
339-
aiohttp-latest: pytest-asyncio
340-
341332
# Anthropic
342333
anthropic: pytest-asyncio
343334
anthropic-v{0.16,0.28}: httpx<0.28.0
@@ -549,15 +540,6 @@ deps =
549540
sanic-v24.6: sanic~=24.6.0
550541
sanic-latest: sanic
551542

552-
# Trytond
553-
trytond: werkzeug
554-
trytond-v4: werkzeug<1.0
555-
trytond-v4: trytond~=4.0
556-
trytond-v5: trytond~=5.0
557-
trytond-v6: trytond~=6.0
558-
trytond-v7: trytond~=7.0
559-
trytond-latest: trytond
560-
561543
# === Integrations - Auto-generated ===
562544
# These come from the populate_tox.py script. Eventually we should move all
563545
# integration tests there.
@@ -692,6 +674,13 @@ deps =
692674

693675

694676
# ~~~ Web 2 ~~~
677+
aiohttp-v3.6.3: aiohttp==3.6.3
678+
aiohttp-v3.8.6: aiohttp==3.8.6
679+
aiohttp-v3.10.9: aiohttp==3.10.9
680+
aiohttp-v3.11.11: aiohttp==3.11.11
681+
aiohttp: pytest-aiohttp
682+
aiohttp: pytest-asyncio
683+
695684
bottle-v0.12.25: bottle==0.12.25
696685
bottle-v0.13.2: bottle==0.13.2
697686
bottle: werkzeug<2.1.0
@@ -731,6 +720,13 @@ deps =
731720
loguru-v0.6.0: loguru==0.6.0
732721
loguru-v0.7.3: loguru==0.7.3
733722

723+
trytond-v5.0.63: trytond==5.0.63
724+
trytond-v5.8.16: trytond==5.8.16
725+
trytond-v6.8.17: trytond==6.8.17
726+
trytond-v7.0.9: trytond==7.0.9
727+
trytond-v7.4.4: trytond==7.4.4
728+
trytond: werkzeug
729+
734730
typer-v0.15.1: typer==0.15.1
735731

736732

0 commit comments

Comments
 (0)