Skip to content

Commit c25c33f

Browse files
sentrivanasentrivana
committed
Merge branch 'master' into ivana/tox-script-3
2 parents c18d600 + a78af17 commit c25c33f

File tree

5 files changed

+71
-163
lines changed

5 files changed

+71
-163
lines changed

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

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -22,82 +22,14 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-graphql-latest:
26-
name: GraphQL (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.7","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 ariadne latest
51-
run: |
52-
set -x # print commands that are executed
53-
./scripts/runtox.sh "py${{ matrix.python-version }}-ariadne-latest"
54-
- name: Test gql latest
55-
run: |
56-
set -x # print commands that are executed
57-
./scripts/runtox.sh "py${{ matrix.python-version }}-gql-latest"
58-
- name: Test graphene latest
59-
run: |
60-
set -x # print commands that are executed
61-
./scripts/runtox.sh "py${{ matrix.python-version }}-graphene-latest"
62-
- name: Test strawberry latest
63-
run: |
64-
set -x # print commands that are executed
65-
./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry-latest"
66-
- name: Generate coverage XML (Python 3.6)
67-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
68-
run: |
69-
export COVERAGE_RCFILE=.coveragerc36
70-
coverage combine .coverage-sentry-*
71-
coverage xml --ignore-errors
72-
- name: Generate coverage XML
73-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
74-
run: |
75-
coverage combine .coverage-sentry-*
76-
coverage xml
77-
- name: Upload coverage to Codecov
78-
if: ${{ !cancelled() }}
79-
uses: codecov/[email protected]
80-
with:
81-
token: ${{ secrets.CODECOV_TOKEN }}
82-
files: coverage.xml
83-
# make sure no plugins alter our coverage reports
84-
plugin: noop
85-
verbose: true
86-
- name: Upload test results to Codecov
87-
if: ${{ !cancelled() }}
88-
uses: codecov/test-results-action@v1
89-
with:
90-
token: ${{ secrets.CODECOV_TOKEN }}
91-
files: .junitxml
92-
verbose: true
9325
test-graphql-pinned:
9426
name: GraphQL (pinned)
9527
timeout-minutes: 30
9628
runs-on: ${{ matrix.os }}
9729
strategy:
9830
fail-fast: false
9931
matrix:
100-
python-version: ["3.7","3.8","3.11","3.12"]
32+
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
10133
# python3.6 reached EOL and is no longer being supported on
10234
# new versions of hosted runners on Github Actions
10335
# ubuntu-20.04 is the last version that supported python3.6

‎scripts/populate_tox/config.py‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,35 @@
66
# See scripts/populate_tox/README.md for more info on the format and examples.
77

88
TEST_SUITE_CONFIG = {
9-
"openfeature": {
10-
"package": "openfeature-sdk",
9+
"ariadne": {
10+
"package": "ariadne",
11+
"deps": {
12+
"*": ["fastapi", "flask", "httpx"],
13+
},
14+
"python": ">=3.8",
15+
},
16+
"gql": {
17+
"package": "gql[all]",
18+
},
19+
"graphene": {
20+
"package": "graphene",
21+
"deps": {
22+
"*": ["blinker", "fastapi", "flask", "httpx"],
23+
"py3.6": ["aiocontextvars"],
24+
},
1125
},
1226
"launchdarkly": {
1327
"package": "launchdarkly-server-sdk",
1428
},
29+
"openfeature": {
30+
"package": "openfeature-sdk",
31+
},
32+
"strawberry": {
33+
"package": "strawberry-graphql[fastapi,flask]",
34+
"deps": {
35+
"*": ["httpx"],
36+
},
37+
},
1538
"unleash": {
1639
"package": "UnleashClient",
1740
},

‎scripts/populate_tox/populate_tox.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
"potel",
5757
"aiohttp",
5858
"anthropic",
59-
"ariadne",
6059
"arq",
6160
"asgi",
6261
"asyncpg",
@@ -76,8 +75,6 @@
7675
"fastapi",
7776
"flask",
7877
"gcp",
79-
"gql",
80-
"graphene",
8178
"grpc",
8279
"httpx",
8380
"huey",
@@ -102,7 +99,6 @@
10299
"starlette",
103100
"starlite",
104101
"sqlalchemy",
105-
"strawberry",
106102
"tornado",
107103
"trytond",
108104
"typer",

‎scripts/populate_tox/tox.jinja‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ envlist =
4343
{py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40}
4444
{py3.7,py3.11,py3.12}-anthropic-latest
4545

46-
# Ariadne
47-
{py3.8,py3.11}-ariadne-v{0.20}
48-
{py3.8,py3.12,py3.13}-ariadne-latest
49-
5046
# Arq
5147
{py3.7,py3.11}-arq-v{0.23}
5248
{py3.7,py3.12,py3.13}-arq-latest
@@ -140,14 +136,6 @@ envlist =
140136
# GCP
141137
{py3.7}-gcp
142138

143-
# GQL
144-
{py3.7,py3.11}-gql-v{3.4}
145-
{py3.7,py3.12,py3.13}-gql-latest
146-
147-
# Graphene
148-
{py3.7,py3.11}-graphene-v{3.3}
149-
{py3.7,py3.12,py3.13}-graphene-latest
150-
151139
# gRPC
152140
{py3.7,py3.9}-grpc-v{1.39}
153141
{py3.7,py3.10}-grpc-v{1.49}
@@ -268,11 +256,6 @@ envlist =
268256
{py3.7,py3.11}-sqlalchemy-v{2.0}
269257
{py3.7,py3.12,py3.13}-sqlalchemy-latest
270258

271-
# Strawberry
272-
{py3.8,py3.11}-strawberry-v{0.209}
273-
{py3.8,py3.11,py3.12}-strawberry-v{0.222}
274-
{py3.8,py3.12,py3.13}-strawberry-latest
275-
276259
# Tornado
277260
{py3.8,py3.11,py3.12}-tornado-v{6.0}
278261
{py3.8,py3.11,py3.12}-tornado-v{6.2}
@@ -350,13 +333,6 @@ deps =
350333
anthropic-v0.40: anthropic~=0.40.0
351334
anthropic-latest: anthropic
352335
353-
# Ariadne
354-
ariadne-v0.20: ariadne~=0.20.0
355-
ariadne-latest: ariadne
356-
ariadne: fastapi
357-
ariadne: flask
358-
ariadne: httpx
359-
360336
# Arq
361337
arq-v0.23: arq~=0.23.0
362338
arq-v0.23: pydantic<2
@@ -483,18 +459,6 @@ deps =
483459
flask-v3: Flask~=3.0
484460
flask-latest: Flask
485461
486-
# GQL
487-
gql-v{3.4}: gql[all]~=3.4.0
488-
gql-latest: gql[all]
489-
490-
# Graphene
491-
graphene: blinker
492-
graphene: fastapi
493-
graphene: flask
494-
graphene: httpx
495-
graphene-v{3.3}: graphene~=3.3.0
496-
graphene-latest: graphene
497-
498462
# gRPC
499463
grpc: protobuf
500464
grpc: mypy-protobuf
@@ -707,14 +671,6 @@ deps =
707671
sqlalchemy-v2.0: sqlalchemy~=2.0.0
708672
sqlalchemy-latest: sqlalchemy
709673
710-
# Strawberry
711-
strawberry: fastapi
712-
strawberry: flask
713-
strawberry: httpx
714-
strawberry-v0.209: strawberry-graphql[fastapi,flask]~=0.209.0
715-
strawberry-v0.222: strawberry-graphql[fastapi,flask]~=0.222.0
716-
strawberry-latest: strawberry-graphql[fastapi,flask]
717-
718674
# Tornado
719675
# Tornado <6.4.1 is incompatible with Pytest ≥8.2
720676
# See https://github.com/tornadoweb/tornado/pull/3382.

‎tox.ini‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ envlist =
4343
{py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40}
4444
{py3.7,py3.11,py3.12}-anthropic-latest
4545

46-
# Ariadne
47-
{py3.8,py3.11}-ariadne-v{0.20}
48-
{py3.8,py3.12,py3.13}-ariadne-latest
49-
5046
# Arq
5147
{py3.7,py3.11}-arq-v{0.23}
5248
{py3.7,py3.12,py3.13}-arq-latest
@@ -140,14 +136,6 @@ envlist =
140136
# GCP
141137
{py3.7}-gcp
142138

143-
# GQL
144-
{py3.7,py3.11}-gql-v{3.4}
145-
{py3.7,py3.12,py3.13}-gql-latest
146-
147-
# Graphene
148-
{py3.7,py3.11}-graphene-v{3.3}
149-
{py3.7,py3.12,py3.13}-graphene-latest
150-
151139
# gRPC
152140
{py3.7,py3.9}-grpc-v{1.39}
153141
{py3.7,py3.10}-grpc-v{1.49}
@@ -268,11 +256,6 @@ envlist =
268256
{py3.7,py3.11}-sqlalchemy-v{2.0}
269257
{py3.7,py3.12,py3.13}-sqlalchemy-latest
270258

271-
# Strawberry
272-
{py3.8,py3.11}-strawberry-v{0.209}
273-
{py3.8,py3.11,py3.12}-strawberry-v{0.222}
274-
{py3.8,py3.12,py3.13}-strawberry-latest
275-
276259
# Tornado
277260
{py3.8,py3.11,py3.12}-tornado-v{6.0}
278261
{py3.8,py3.11,py3.12}-tornado-v{6.2}
@@ -304,6 +287,24 @@ envlist =
304287
{py3.8,py3.12,py3.13}-unleash-v6.1.0
305288

306289

290+
# ~~~ GraphQL ~~~
291+
{py3.8,py3.10,py3.11}-ariadne-v0.20.1
292+
{py3.8,py3.11,py3.12}-ariadne-v0.22
293+
{py3.8,py3.11,py3.12}-ariadne-v0.24.0
294+
{py3.8,py3.11,py3.12}-ariadne-v0.25.2
295+
296+
{py3.6,py3.9,py3.10}-gql-v3.4.1
297+
{py3.7,py3.11,py3.12}-gql-v3.5.0
298+
299+
{py3.6,py3.9,py3.10}-graphene-v3.3
300+
{py3.8,py3.12,py3.13}-graphene-v3.4.3
301+
302+
{py3.8,py3.10,py3.11}-strawberry-v0.209.8
303+
{py3.8,py3.11,py3.12}-strawberry-v0.226.2
304+
{py3.8,py3.11,py3.12}-strawberry-v0.243.1
305+
{py3.9,py3.12,py3.13}-strawberry-v0.259.0
306+
307+
307308

308309
[testenv]
309310
deps =
@@ -351,13 +352,6 @@ deps =
351352
anthropic-v0.40: anthropic~=0.40.0
352353
anthropic-latest: anthropic
353354

354-
# Ariadne
355-
ariadne-v0.20: ariadne~=0.20.0
356-
ariadne-latest: ariadne
357-
ariadne: fastapi
358-
ariadne: flask
359-
ariadne: httpx
360-
361355
# Arq
362356
arq-v0.23: arq~=0.23.0
363357
arq-v0.23: pydantic<2
@@ -484,18 +478,6 @@ deps =
484478
flask-v3: Flask~=3.0
485479
flask-latest: Flask
486480

487-
# GQL
488-
gql-v{3.4}: gql[all]~=3.4.0
489-
gql-latest: gql[all]
490-
491-
# Graphene
492-
graphene: blinker
493-
graphene: fastapi
494-
graphene: flask
495-
graphene: httpx
496-
graphene-v{3.3}: graphene~=3.3.0
497-
graphene-latest: graphene
498-
499481
# gRPC
500482
grpc: protobuf
501483
grpc: mypy-protobuf
@@ -708,14 +690,6 @@ deps =
708690
sqlalchemy-v2.0: sqlalchemy~=2.0.0
709691
sqlalchemy-latest: sqlalchemy
710692

711-
# Strawberry
712-
strawberry: fastapi
713-
strawberry: flask
714-
strawberry: httpx
715-
strawberry-v0.209: strawberry-graphql[fastapi,flask]~=0.209.0
716-
strawberry-v0.222: strawberry-graphql[fastapi,flask]~=0.222.0
717-
strawberry-latest: strawberry-graphql[fastapi,flask]
718-
719693
# Tornado
720694
# Tornado <6.4.1 is incompatible with Pytest ≥8.2
721695
# See https://github.com/tornadoweb/tornado/pull/3382.
@@ -752,6 +726,33 @@ deps =
752726
unleash-v6.1.0: UnleashClient==6.1.0
753727

754728

729+
# ~~~ GraphQL ~~~
730+
ariadne-v0.20.1: ariadne==0.20.1
731+
ariadne-v0.22: ariadne==0.22
732+
ariadne-v0.24.0: ariadne==0.24.0
733+
ariadne-v0.25.2: ariadne==0.25.2
734+
ariadne: fastapi
735+
ariadne: flask
736+
ariadne: httpx
737+
738+
gql-v3.4.1: gql[all]==3.4.1
739+
gql-v3.5.0: gql[all]==3.5.0
740+
741+
graphene-v3.3: graphene==3.3
742+
graphene-v3.4.3: graphene==3.4.3
743+
graphene: blinker
744+
graphene: fastapi
745+
graphene: flask
746+
graphene: httpx
747+
py3.6-graphene: aiocontextvars
748+
749+
strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
750+
strawberry-v0.226.2: strawberry-graphql[fastapi,flask]==0.226.2
751+
strawberry-v0.243.1: strawberry-graphql[fastapi,flask]==0.243.1
752+
strawberry-v0.259.0: strawberry-graphql[fastapi,flask]==0.259.0
753+
strawberry: httpx
754+
755+
755756

756757
setenv =
757758
PYTHONDONTWRITEBYTECODE=1

0 commit comments

Comments
 (0)