Skip to content

tests: Move django under toxgen #4238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations-web-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8","3.10","3.12","3.13"]
python-version: ["3.8","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
Expand Down
19 changes: 19 additions & 0 deletions scripts/populate_tox/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,25 @@
"clickhouse_driver": {
"package": "clickhouse-driver",
},
"django": {
"package": "django",
"deps": {
"*": [
"psycopg2-binary",
"djangorestframework",
"pytest-django",
"Werkzeug",
],
">=3.0": ["pytest-asyncio"],
">=2.2,<3.1": ["six"],
"<3.3": [
"djangorestframework>=3.0,<4.0",
"Werkzeug<2.1.0",
],
"<3.1": ["pytest-django<4.0"],
">=2.0": ["channels[daphne]"],
},
},
"dramatiq": {
"package": "dramatiq",
},
Expand Down
1 change: 0 additions & 1 deletion scripts/populate_tox/populate_tox.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
"boto3",
"chalice",
"cohere",
"django",
"fastapi",
"gcp",
"httpx",
Expand Down
44 changes: 0 additions & 44 deletions scripts/populate_tox/tox.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,6 @@ envlist =
{py3.9,py3.11,py3.12}-cohere-v5
{py3.9,py3.11,py3.12}-cohere-latest

# Django
# - Django 1.x
{py3.6,py3.7}-django-v{1.11}
# - Django 2.x
{py3.6,py3.7}-django-v{2.0}
{py3.6,py3.9}-django-v{2.2}
# - Django 3.x
{py3.6,py3.9}-django-v{3.0}
{py3.6,py3.9,py3.11}-django-v{3.2}
# - Django 4.x
{py3.8,py3.11,py3.12}-django-v{4.0,4.1,4.2}
# - Django 5.x
{py3.10,py3.11,py3.12}-django-v{5.0,5.1}
{py3.10,py3.12,py3.13}-django-latest

# FastAPI
{py3.7,py3.10}-fastapi-v{0.79}
{py3.8,py3.12,py3.13}-fastapi-latest
Expand Down Expand Up @@ -267,35 +252,6 @@ deps =
cohere-v5: cohere~=5.3.3
cohere-latest: cohere

# Django
django: psycopg2-binary
django-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
django-v{2.0,2.2,3.0,3.2,4.0,4.1,4.2,5.0,5.1}: channels[daphne]
django-v{2.2,3.0}: six
django-v{1.11,2.0,2.2,3.0,3.2}: Werkzeug<2.1.0
django-v{1.11,2.0,2.2,3.0}: pytest-django<4.0
django-v{3.2,4.0,4.1,4.2,5.0,5.1}: pytest-django
django-v{4.0,4.1,4.2,5.0,5.1}: djangorestframework
django-v{4.0,4.1,4.2,5.0,5.1}: pytest-asyncio
django-v{4.0,4.1,4.2,5.0,5.1}: Werkzeug
django-latest: djangorestframework
django-latest: pytest-asyncio
django-latest: pytest-django
django-latest: Werkzeug
django-latest: channels[daphne]

django-v1.11: Django~=1.11.0
django-v2.0: Django~=2.0.0
django-v2.2: Django~=2.2.0
django-v3.0: Django~=3.0.0
django-v3.2: Django~=3.2.0
django-v4.0: Django~=4.0.0
django-v4.1: Django~=4.1.0
django-v4.2: Django~=4.2.0
django-v5.0: Django~=5.0.0
django-v5.1: Django==5.1rc1
django-latest: Django

# FastAPI
fastapi: httpx
# (this is a dependency of httpx)
Expand Down
101 changes: 48 additions & 53 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# The file (and all resulting CI YAMLs) then need to be regenerated via
# "scripts/generate-test-files.sh".
#
# Last generated: 2025-03-31T10:49:05.789167+00:00
# Last generated: 2025-04-03T11:46:44.595900+00:00

[tox]
requires =
Expand Down Expand Up @@ -80,21 +80,6 @@ envlist =
{py3.9,py3.11,py3.12}-cohere-v5
{py3.9,py3.11,py3.12}-cohere-latest

# Django
# - Django 1.x
{py3.6,py3.7}-django-v{1.11}
# - Django 2.x
{py3.6,py3.7}-django-v{2.0}
{py3.6,py3.9}-django-v{2.2}
# - Django 3.x
{py3.6,py3.9}-django-v{3.0}
{py3.6,py3.9,py3.11}-django-v{3.2}
# - Django 4.x
{py3.8,py3.11,py3.12}-django-v{4.0,4.1,4.2}
# - Django 5.x
{py3.10,py3.11,py3.12}-django-v{5.0,5.1}
{py3.10,py3.12,py3.13}-django-latest

# FastAPI
{py3.7,py3.10}-fastapi-v{0.79}
{py3.8,py3.12,py3.13}-fastapi-latest
Expand Down Expand Up @@ -217,7 +202,7 @@ envlist =
{py3.8,py3.10,py3.11}-strawberry-v0.209.8
{py3.8,py3.11,py3.12}-strawberry-v0.227.7
{py3.8,py3.11,py3.12}-strawberry-v0.245.0
{py3.9,py3.12,py3.13}-strawberry-v0.262.6
{py3.9,py3.12,py3.13}-strawberry-v0.263.0


# ~~~ Network ~~~
Expand All @@ -230,8 +215,7 @@ envlist =
# ~~~ Tasks ~~~
{py3.6,py3.7,py3.8}-celery-v4.4.7
{py3.6,py3.7,py3.8}-celery-v5.0.5
{py3.8,py3.11,py3.12}-celery-v5.4.0
{py3.8,py3.12,py3.13}-celery-v5.5.0rc5
{py3.8,py3.12,py3.13}-celery-v5.5.0

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


# ~~~ Web 1 ~~~
{py3.6}-django-v1.11.9
{py3.6,py3.7}-django-v1.11.29
{py3.6,py3.8,py3.9}-django-v2.2.28
{py3.6,py3.9,py3.10}-django-v3.2.25
{py3.8,py3.11,py3.12}-django-v4.2.20
{py3.10,py3.11,py3.12}-django-v5.0.9
{py3.10,py3.12,py3.13}-django-v5.2

{py3.6,py3.7,py3.8}-flask-v1.1.4
{py3.8,py3.12,py3.13}-flask-v2.3.3
{py3.8,py3.12,py3.13}-flask-v3.0.3
Expand Down Expand Up @@ -293,7 +285,7 @@ envlist =
{py3.6,py3.7,py3.8}-trytond-v5.8.16
{py3.8,py3.10,py3.11}-trytond-v6.8.17
{py3.8,py3.11,py3.12}-trytond-v7.0.9
{py3.8,py3.11,py3.12}-trytond-v7.4.8
{py3.8,py3.11,py3.12}-trytond-v7.4.9

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

Expand Down Expand Up @@ -389,35 +381,6 @@ deps =
cohere-v5: cohere~=5.3.3
cohere-latest: cohere

# Django
django: psycopg2-binary
django-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
django-v{2.0,2.2,3.0,3.2,4.0,4.1,4.2,5.0,5.1}: channels[daphne]
django-v{2.2,3.0}: six
django-v{1.11,2.0,2.2,3.0,3.2}: Werkzeug<2.1.0
django-v{1.11,2.0,2.2,3.0}: pytest-django<4.0
django-v{3.2,4.0,4.1,4.2,5.0,5.1}: pytest-django
django-v{4.0,4.1,4.2,5.0,5.1}: djangorestframework
django-v{4.0,4.1,4.2,5.0,5.1}: pytest-asyncio
django-v{4.0,4.1,4.2,5.0,5.1}: Werkzeug
django-latest: djangorestframework
django-latest: pytest-asyncio
django-latest: pytest-django
django-latest: Werkzeug
django-latest: channels[daphne]

django-v1.11: Django~=1.11.0
django-v2.0: Django~=2.0.0
django-v2.2: Django~=2.2.0
django-v3.0: Django~=3.0.0
django-v3.2: Django~=3.2.0
django-v4.0: Django~=4.0.0
django-v4.1: Django~=4.1.0
django-v4.2: Django~=4.2.0
django-v5.0: Django~=5.0.0
django-v5.1: Django==5.1rc1
django-latest: Django

# FastAPI
fastapi: httpx
# (this is a dependency of httpx)
Expand Down Expand Up @@ -611,7 +574,7 @@ deps =
strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
strawberry-v0.227.7: strawberry-graphql[fastapi,flask]==0.227.7
strawberry-v0.245.0: strawberry-graphql[fastapi,flask]==0.245.0
strawberry-v0.262.6: strawberry-graphql[fastapi,flask]==0.262.6
strawberry-v0.263.0: strawberry-graphql[fastapi,flask]==0.263.0
strawberry: httpx
strawberry-v0.209.8: pydantic<2.11
strawberry-v0.227.7: pydantic<2.11
Expand All @@ -632,8 +595,7 @@ deps =
# ~~~ Tasks ~~~
celery-v4.4.7: celery==4.4.7
celery-v5.0.5: celery==5.0.5
celery-v5.4.0: celery==5.4.0
celery-v5.5.0rc5: celery==5.5.0rc5
celery-v5.5.0: celery==5.5.0
celery: newrelic
celery: redis
py3.7-celery: importlib-metadata<5.0
Expand All @@ -650,6 +612,39 @@ deps =


# ~~~ Web 1 ~~~
django-v1.11.9: django==1.11.9
django-v1.11.29: django==1.11.29
django-v2.2.28: django==2.2.28
django-v3.2.25: django==3.2.25
django-v4.2.20: django==4.2.20
django-v5.0.9: django==5.0.9
django-v5.2: django==5.2
django: psycopg2-binary
django: djangorestframework
django: pytest-django
django: Werkzeug
django-v3.2.25: pytest-asyncio
django-v4.2.20: pytest-asyncio
django-v5.0.9: pytest-asyncio
django-v5.2: pytest-asyncio
django-v2.2.28: six
django-v1.11.9: djangorestframework>=3.0,<4.0
django-v1.11.9: Werkzeug<2.1.0
django-v1.11.29: djangorestframework>=3.0,<4.0
django-v1.11.29: Werkzeug<2.1.0
django-v2.2.28: djangorestframework>=3.0,<4.0
django-v2.2.28: Werkzeug<2.1.0
django-v3.2.25: djangorestframework>=3.0,<4.0
django-v3.2.25: Werkzeug<2.1.0
django-v1.11.9: pytest-django<4.0
django-v1.11.29: pytest-django<4.0
django-v2.2.28: pytest-django<4.0
django-v2.2.28: channels[daphne]
django-v3.2.25: channels[daphne]
django-v4.2.20: channels[daphne]
django-v5.0.9: channels[daphne]
django-v5.2: channels[daphne]

flask-v1.1.4: flask==1.1.4
flask-v2.3.3: flask==2.3.3
flask-v3.0.3: flask==3.0.3
Expand Down Expand Up @@ -731,7 +726,7 @@ deps =
trytond-v5.8.16: trytond==5.8.16
trytond-v6.8.17: trytond==6.8.17
trytond-v7.0.9: trytond==7.0.9
trytond-v7.4.8: trytond==7.4.8
trytond-v7.4.9: trytond==7.4.9
trytond: werkzeug
trytond-v4.6.9: werkzeug<1.0
trytond-v4.8.18: werkzeug<1.0
Expand Down
Loading