Skip to content

Commit 008b9c4

Browse files
committed
tests: Move django under toxgen
1 parent 5f71872 commit 008b9c4

File tree

5 files changed

+67
-51
lines changed

5 files changed

+67
-51
lines changed

.github/workflows/test-integrations-web-1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.8","3.10","3.12","3.13"]
32+
python-version: ["3.8","3.12","3.13"]
3333
# python3.6 reached EOL and is no longer being supported on
3434
# new versions of hosted runners on Github Actions
3535
# ubuntu-20.04 is the last version that supported python3.6

scripts/populate_tox/config.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,26 @@
2929
"clickhouse_driver": {
3030
"package": "clickhouse-driver",
3131
},
32+
"django": {
33+
"package": "django",
34+
"deps": {
35+
"*": [
36+
"psycopg2-binary",
37+
"djangorestframework",
38+
"pytest-asyncio",
39+
"pytest-django",
40+
"Werkzeug",
41+
"channels[daphne]",
42+
],
43+
">=2.2,<3.1": ["six"],
44+
"<3.3": [
45+
"djangorestframework>=3.0,<4.0",
46+
"Werkzeug<2.1.0",
47+
],
48+
"<3.1": ["pytest-django<4.0"],
49+
">=2.0": ["channels[daphne]"],
50+
},
51+
},
3252
"dramatiq": {
3353
"package": "dramatiq",
3454
},

scripts/populate_tox/populate_tox.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
"boto3",
7070
"chalice",
7171
"cohere",
72-
"django",
7372
"fastapi",
7473
"gcp",
7574
"httpx",

scripts/populate_tox/tox.jinja

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,6 @@ envlist =
8080
{py3.9,py3.11,py3.12}-cohere-v5
8181
{py3.9,py3.11,py3.12}-cohere-latest
8282

83-
# Django
84-
# - Django 1.x
85-
{py3.6,py3.7}-django-v{1.11}
86-
# - Django 2.x
87-
{py3.6,py3.7}-django-v{2.0}
88-
{py3.6,py3.9}-django-v{2.2}
89-
# - Django 3.x
90-
{py3.6,py3.9}-django-v{3.0}
91-
{py3.6,py3.9,py3.11}-django-v{3.2}
92-
# - Django 4.x
93-
{py3.8,py3.11,py3.12}-django-v{4.0,4.1,4.2}
94-
# - Django 5.x
95-
{py3.10,py3.11,py3.12}-django-v{5.0,5.1}
96-
{py3.10,py3.12,py3.13}-django-latest
97-
9883
# FastAPI
9984
{py3.7,py3.10}-fastapi-v{0.79}
10085
{py3.8,py3.12,py3.13}-fastapi-latest
@@ -268,11 +253,6 @@ deps =
268253
cohere-latest: cohere
269254
270255
# Django
271-
django: psycopg2-binary
272-
django-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
273-
django-v{2.0,2.2,3.0,3.2,4.0,4.1,4.2,5.0,5.1}: channels[daphne]
274-
django-v{2.2,3.0}: six
275-
django-v{1.11,2.0,2.2,3.0,3.2}: Werkzeug<2.1.0
276256
django-v{1.11,2.0,2.2,3.0}: pytest-django<4.0
277257
django-v{3.2,4.0,4.1,4.2,5.0,5.1}: pytest-django
278258
django-v{4.0,4.1,4.2,5.0,5.1}: djangorestframework

tox.ini

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# The file (and all resulting CI YAMLs) then need to be regenerated via
1111
# "scripts/generate-test-files.sh".
1212
#
13-
# Last generated: 2025-03-31T10:49:05.789167+00:00
13+
# Last generated: 2025-04-03T11:16:47.342751+00:00
1414

1515
[tox]
1616
requires =
@@ -80,21 +80,6 @@ envlist =
8080
{py3.9,py3.11,py3.12}-cohere-v5
8181
{py3.9,py3.11,py3.12}-cohere-latest
8282

83-
# Django
84-
# - Django 1.x
85-
{py3.6,py3.7}-django-v{1.11}
86-
# - Django 2.x
87-
{py3.6,py3.7}-django-v{2.0}
88-
{py3.6,py3.9}-django-v{2.2}
89-
# - Django 3.x
90-
{py3.6,py3.9}-django-v{3.0}
91-
{py3.6,py3.9,py3.11}-django-v{3.2}
92-
# - Django 4.x
93-
{py3.8,py3.11,py3.12}-django-v{4.0,4.1,4.2}
94-
# - Django 5.x
95-
{py3.10,py3.11,py3.12}-django-v{5.0,5.1}
96-
{py3.10,py3.12,py3.13}-django-latest
97-
9883
# FastAPI
9984
{py3.7,py3.10}-fastapi-v{0.79}
10085
{py3.8,py3.12,py3.13}-fastapi-latest
@@ -217,7 +202,7 @@ envlist =
217202
{py3.8,py3.10,py3.11}-strawberry-v0.209.8
218203
{py3.8,py3.11,py3.12}-strawberry-v0.227.7
219204
{py3.8,py3.11,py3.12}-strawberry-v0.245.0
220-
{py3.9,py3.12,py3.13}-strawberry-v0.262.6
205+
{py3.9,py3.12,py3.13}-strawberry-v0.263.0
221206

222207

223208
# ~~~ Network ~~~
@@ -230,8 +215,7 @@ envlist =
230215
# ~~~ Tasks ~~~
231216
{py3.6,py3.7,py3.8}-celery-v4.4.7
232217
{py3.6,py3.7,py3.8}-celery-v5.0.5
233-
{py3.8,py3.11,py3.12}-celery-v5.4.0
234-
{py3.8,py3.12,py3.13}-celery-v5.5.0rc5
218+
{py3.8,py3.12,py3.13}-celery-v5.5.0
235219

236220
{py3.6,py3.7}-dramatiq-v1.9.0
237221
{py3.6,py3.8,py3.9}-dramatiq-v1.12.3
@@ -245,6 +229,14 @@ envlist =
245229

246230

247231
# ~~~ Web 1 ~~~
232+
{py3.6}-django-v1.11.9
233+
{py3.6,py3.7}-django-v1.11.29
234+
{py3.6,py3.8,py3.9}-django-v2.2.28
235+
{py3.6,py3.9,py3.10}-django-v3.2.25
236+
{py3.8,py3.11,py3.12}-django-v4.2.20
237+
{py3.10,py3.11,py3.12}-django-v5.0.9
238+
{py3.10,py3.12,py3.13}-django-v5.2
239+
248240
{py3.6,py3.7,py3.8}-flask-v1.1.4
249241
{py3.8,py3.12,py3.13}-flask-v2.3.3
250242
{py3.8,py3.12,py3.13}-flask-v3.0.3
@@ -293,7 +285,7 @@ envlist =
293285
{py3.6,py3.7,py3.8}-trytond-v5.8.16
294286
{py3.8,py3.10,py3.11}-trytond-v6.8.17
295287
{py3.8,py3.11,py3.12}-trytond-v7.0.9
296-
{py3.8,py3.11,py3.12}-trytond-v7.4.8
288+
{py3.8,py3.11,py3.12}-trytond-v7.4.9
297289

298290
{py3.7,py3.12,py3.13}-typer-v0.15.2
299291

@@ -390,11 +382,6 @@ deps =
390382
cohere-latest: cohere
391383

392384
# Django
393-
django: psycopg2-binary
394-
django-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
395-
django-v{2.0,2.2,3.0,3.2,4.0,4.1,4.2,5.0,5.1}: channels[daphne]
396-
django-v{2.2,3.0}: six
397-
django-v{1.11,2.0,2.2,3.0,3.2}: Werkzeug<2.1.0
398385
django-v{1.11,2.0,2.2,3.0}: pytest-django<4.0
399386
django-v{3.2,4.0,4.1,4.2,5.0,5.1}: pytest-django
400387
django-v{4.0,4.1,4.2,5.0,5.1}: djangorestframework
@@ -611,7 +598,7 @@ deps =
611598
strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
612599
strawberry-v0.227.7: strawberry-graphql[fastapi,flask]==0.227.7
613600
strawberry-v0.245.0: strawberry-graphql[fastapi,flask]==0.245.0
614-
strawberry-v0.262.6: strawberry-graphql[fastapi,flask]==0.262.6
601+
strawberry-v0.263.0: strawberry-graphql[fastapi,flask]==0.263.0
615602
strawberry: httpx
616603
strawberry-v0.209.8: pydantic<2.11
617604
strawberry-v0.227.7: pydantic<2.11
@@ -632,8 +619,7 @@ deps =
632619
# ~~~ Tasks ~~~
633620
celery-v4.4.7: celery==4.4.7
634621
celery-v5.0.5: celery==5.0.5
635-
celery-v5.4.0: celery==5.4.0
636-
celery-v5.5.0rc5: celery==5.5.0rc5
622+
celery-v5.5.0: celery==5.5.0
637623
celery: newrelic
638624
celery: redis
639625
py3.7-celery: importlib-metadata<5.0
@@ -650,6 +636,37 @@ deps =
650636

651637

652638
# ~~~ Web 1 ~~~
639+
django-v1.11.9: django==1.11.9
640+
django-v1.11.29: django==1.11.29
641+
django-v2.2.28: django==2.2.28
642+
django-v3.2.25: django==3.2.25
643+
django-v4.2.20: django==4.2.20
644+
django-v5.0.9: django==5.0.9
645+
django-v5.2: django==5.2
646+
django: psycopg2-binary
647+
django: djangorestframework
648+
django: pytest-asyncio
649+
django: pytest-django
650+
django: Werkzeug
651+
django: channels[daphne]
652+
django-v2.2.28: six
653+
django-v1.11.9: djangorestframework>=3.0,<4.0
654+
django-v1.11.9: Werkzeug<2.1.0
655+
django-v1.11.29: djangorestframework>=3.0,<4.0
656+
django-v1.11.29: Werkzeug<2.1.0
657+
django-v2.2.28: djangorestframework>=3.0,<4.0
658+
django-v2.2.28: Werkzeug<2.1.0
659+
django-v3.2.25: djangorestframework>=3.0,<4.0
660+
django-v3.2.25: Werkzeug<2.1.0
661+
django-v1.11.9: pytest-django<4.0
662+
django-v1.11.29: pytest-django<4.0
663+
django-v2.2.28: pytest-django<4.0
664+
django-v2.2.28: channels[daphne]
665+
django-v3.2.25: channels[daphne]
666+
django-v4.2.20: channels[daphne]
667+
django-v5.0.9: channels[daphne]
668+
django-v5.2: channels[daphne]
669+
653670
flask-v1.1.4: flask==1.1.4
654671
flask-v2.3.3: flask==2.3.3
655672
flask-v3.0.3: flask==3.0.3
@@ -731,7 +748,7 @@ deps =
731748
trytond-v5.8.16: trytond==5.8.16
732749
trytond-v6.8.17: trytond==6.8.17
733750
trytond-v7.0.9: trytond==7.0.9
734-
trytond-v7.4.8: trytond==7.4.8
751+
trytond-v7.4.9: trytond==7.4.9
735752
trytond: werkzeug
736753
trytond-v4.6.9: werkzeug<1.0
737754
trytond-v4.8.18: werkzeug<1.0

0 commit comments

Comments
 (0)