Skip to content

Commit 16cf3a6

Browse files
sentrivanasentrivana
committed
Move tasks over to toxgen
1 parent 3ac285d commit 16cf3a6

File tree

4 files changed

+47
-114
lines changed

4 files changed

+47
-114
lines changed

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

Lines changed: 2 additions & 2 deletions
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.6","3.7","3.8","3.10","3.11","3.12","3.13"]
32+
python-version: ["3.7","3.8","3.10","3.11","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
@@ -115,7 +115,7 @@ jobs:
115115
strategy:
116116
fail-fast: false
117117
matrix:
118-
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
118+
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
119119
# python3.6 reached EOL and is no longer being supported on
120120
# new versions of hosted runners on Github Actions
121121
# ubuntu-20.04 is the last version that supported python3.6

‎scripts/populate_tox/populate_tox.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,12 @@
6262
"beam",
6363
"boto3",
6464
"bottle",
65-
"celery",
6665
"chalice",
6766
"clickhouse_driver",
6867
"cohere",
6968
"cloud_resource_context",
7069
"cohere",
7170
"django",
72-
"dramatiq",
7371
"falcon",
7472
"fastapi",
7573
"flask",
@@ -78,7 +76,6 @@
7876
"graphene",
7977
"grpc",
8078
"httpx",
81-
"huey",
8279
"huggingface_hub",
8380
"langchain",
8481
"langchain_notiktoken",
@@ -98,7 +95,6 @@
9895
"requests",
9996
"rq",
10097
"sanic",
101-
"spark",
10298
"starlette",
10399
"starlite",
104100
"sqlalchemy",

‎scripts/populate_tox/tox.jinja‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ envlist =
7878
{py3.6,py3.9}-bottle-v{0.12}
7979
{py3.6,py3.12,py3.13}-bottle-latest
8080

81-
# Celery
82-
{py3.6,py3.8}-celery-v{4}
83-
{py3.6,py3.8}-celery-v{5.0}
84-
{py3.7,py3.10}-celery-v{5.1,5.2}
85-
{py3.8,py3.11,py3.12}-celery-v{5.3,5.4,5.5}
86-
{py3.8,py3.12,py3.13}-celery-latest
87-
8881
# Chalice
8982
{py3.6,py3.9}-chalice-v{1.16}
9083
{py3.8,py3.12,py3.13}-chalice-latest
@@ -115,12 +108,6 @@ envlist =
115108
{py3.10,py3.11,py3.12}-django-v{5.0,5.1}
116109
{py3.10,py3.12,py3.13}-django-latest
117110

118-
# dramatiq
119-
{py3.6,py3.9}-dramatiq-v{1.13}
120-
{py3.7,py3.10,py3.11}-dramatiq-v{1.15}
121-
{py3.8,py3.11,py3.12}-dramatiq-v{1.17}
122-
{py3.8,py3.11,py3.12}-dramatiq-latest
123-
124111
# Falcon
125112
{py3.6,py3.7}-falcon-v{1,1.4,2}
126113
{py3.6,py3.11,py3.12}-falcon-v{3}
@@ -161,10 +148,6 @@ envlist =
161148
{py3.9,py3.11,py3.12}-httpx-v{0.25,0.27}
162149
{py3.9,py3.12,py3.13}-httpx-latest
163150

164-
# Huey
165-
{py3.6,py3.11,py3.12}-huey-v{2.0}
166-
{py3.6,py3.12,py3.13}-huey-latest
167-
168151
# Huggingface Hub
169152
{py3.9,py3.12,py3.13}-huggingface_hub-{v0.22}
170153
{py3.9,py3.12,py3.13}-huggingface_hub-latest
@@ -257,10 +240,6 @@ envlist =
257240
{py3.8,py3.11,py3.12}-sanic-v{24.6}
258241
{py3.9,py3.12,py3.13}-sanic-latest
259242

260-
# Spark
261-
{py3.8,py3.10,py3.11}-spark-v{3.1,3.3,3.5}
262-
{py3.8,py3.10,py3.11,py3.12}-spark-latest
263-
264243
# Starlette
265244
{py3.7,py3.10}-starlette-v{0.19}
266245
{py3.7,py3.11}-starlette-v{0.24,0.28}
@@ -404,21 +383,6 @@ deps =
404383
bottle-v0.12: bottle~=0.12.0
405384
bottle-latest: bottle
406385
407-
# Celery
408-
celery: redis
409-
celery-v4: Celery~=4.0
410-
celery-v5.0: Celery~=5.0.0
411-
celery-v5.1: Celery~=5.1.0
412-
celery-v5.2: Celery~=5.2.0
413-
celery-v5.3: Celery~=5.3.0
414-
celery-v5.4: Celery~=5.4.0
415-
# TODO: update when stable is out
416-
celery-v5.5: Celery==5.5.0rc4
417-
celery-latest: Celery
418-
419-
celery: newrelic
420-
{py3.7}-celery: importlib-metadata<5.0
421-
422386
# Chalice
423387
chalice: pytest-chalice==0.0.5
424388
chalice-v1.16: chalice~=1.16.0
@@ -461,12 +425,6 @@ deps =
461425
django-v5.1: Django==5.1rc1
462426
django-latest: Django
463427
464-
# dramatiq
465-
dramatiq-v1.13: dramatiq>=1.13,<1.14
466-
dramatiq-v1.15: dramatiq>=1.15,<1.16
467-
dramatiq-v1.17: dramatiq>=1.17,<1.18
468-
dramatiq-latest: dramatiq
469-
470428
# Falcon
471429
falcon-v1.4: falcon~=1.4.0
472430
falcon-v1: falcon~=1.0
@@ -538,10 +496,6 @@ deps =
538496
httpx-v0.27: httpx~=0.27.0
539497
httpx-latest: httpx
540498
541-
# Huey
542-
huey-v2.0: huey~=2.0.0
543-
huey-latest: huey
544-
545499
# Huggingface Hub
546500
huggingface_hub-v0.22: huggingface_hub~=0.22.2
547501
huggingface_hub-latest: huggingface_hub
@@ -689,14 +643,6 @@ deps =
689643
sanic-v24.6: sanic~=24.6.0
690644
sanic-latest: sanic
691645
692-
# Spark
693-
spark-v3.1: pyspark~=3.1.0
694-
spark-v3.3: pyspark~=3.3.0
695-
spark-v3.5: pyspark~=3.5.0
696-
# TODO: update to ~=4.0.0 once stable is out
697-
spark-v4.0: pyspark==4.0.0.dev2
698-
spark-latest: pyspark
699-
700646
# Starlette
701647
starlette: pytest-asyncio
702648
starlette: python-multipart

‎tox.ini‎

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ envlist =
7878
{py3.6,py3.9}-bottle-v{0.12}
7979
{py3.6,py3.12,py3.13}-bottle-latest
8080

81-
# Celery
82-
{py3.6,py3.8}-celery-v{4}
83-
{py3.6,py3.8}-celery-v{5.0}
84-
{py3.7,py3.10}-celery-v{5.1,5.2}
85-
{py3.8,py3.11,py3.12}-celery-v{5.3,5.4,5.5}
86-
{py3.8,py3.12,py3.13}-celery-latest
87-
8881
# Chalice
8982
{py3.6,py3.9}-chalice-v{1.16}
9083
{py3.8,py3.12,py3.13}-chalice-latest
@@ -115,12 +108,6 @@ envlist =
115108
{py3.10,py3.11,py3.12}-django-v{5.0,5.1}
116109
{py3.10,py3.12,py3.13}-django-latest
117110

118-
# dramatiq
119-
{py3.6,py3.9}-dramatiq-v{1.13}
120-
{py3.7,py3.10,py3.11}-dramatiq-v{1.15}
121-
{py3.8,py3.11,py3.12}-dramatiq-v{1.17}
122-
{py3.8,py3.11,py3.12}-dramatiq-latest
123-
124111
# Falcon
125112
{py3.6,py3.7}-falcon-v{1,1.4,2}
126113
{py3.6,py3.11,py3.12}-falcon-v{3}
@@ -161,10 +148,6 @@ envlist =
161148
{py3.9,py3.11,py3.12}-httpx-v{0.25,0.27}
162149
{py3.9,py3.12,py3.13}-httpx-latest
163150

164-
# Huey
165-
{py3.6,py3.11,py3.12}-huey-v{2.0}
166-
{py3.6,py3.12,py3.13}-huey-latest
167-
168151
# Huggingface Hub
169152
{py3.9,py3.12,py3.13}-huggingface_hub-{v0.22}
170153
{py3.9,py3.12,py3.13}-huggingface_hub-latest
@@ -257,10 +240,6 @@ envlist =
257240
{py3.8,py3.11,py3.12}-sanic-v{24.6}
258241
{py3.9,py3.12,py3.13}-sanic-latest
259242

260-
# Spark
261-
{py3.8,py3.10,py3.11}-spark-v{3.1,3.3,3.5}
262-
{py3.8,py3.10,py3.11,py3.12}-spark-latest
263-
264243
# Starlette
265244
{py3.7,py3.10}-starlette-v{0.19}
266245
{py3.7,py3.11}-starlette-v{0.24,0.28}
@@ -305,6 +284,27 @@ envlist =
305284
# These come from the populate_tox.py script. Eventually we should move all
306285
# integration tests there.
307286

287+
# ~~~ Tasks ~~~
288+
{py3.6,py3.7,py3.8}-celery-v4.4.7
289+
{py3.6,py3.7,py3.8}-celery-v5.0.5
290+
{py3.8,py3.11,py3.12}-celery-v5.4.0
291+
292+
{py3.6,py3.7}-dramatiq-v1.9.0
293+
{py3.6,py3.8,py3.9}-dramatiq-v1.12.3
294+
{py3.7,py3.10,py3.11}-dramatiq-v1.15.0
295+
{py3.8,py3.12,py3.13}-dramatiq-v1.17.1
296+
297+
{py3.6,py3.7}-huey-v2.2.0
298+
{py3.6,py3.7}-huey-v2.3.2
299+
{py3.6,py3.10,py3.11}-huey-v2.4.5
300+
{py3.6,py3.11,py3.12}-huey-v2.5.2
301+
302+
{py3.8,py3.9}-spark-v3.0.3
303+
{py3.8,py3.9}-spark-v3.2.4
304+
{py3.8,py3.10,py3.11}-spark-v3.4.4
305+
{py3.8,py3.10,py3.11}-spark-v3.5.4
306+
307+
308308

309309
[testenv]
310310
deps =
@@ -394,21 +394,6 @@ deps =
394394
bottle-v0.12: bottle~=0.12.0
395395
bottle-latest: bottle
396396

397-
# Celery
398-
celery: redis
399-
celery-v4: Celery~=4.0
400-
celery-v5.0: Celery~=5.0.0
401-
celery-v5.1: Celery~=5.1.0
402-
celery-v5.2: Celery~=5.2.0
403-
celery-v5.3: Celery~=5.3.0
404-
celery-v5.4: Celery~=5.4.0
405-
# TODO: update when stable is out
406-
celery-v5.5: Celery==5.5.0rc4
407-
celery-latest: Celery
408-
409-
celery: newrelic
410-
{py3.7}-celery: importlib-metadata<5.0
411-
412397
# Chalice
413398
chalice: pytest-chalice==0.0.5
414399
chalice-v1.16: chalice~=1.16.0
@@ -451,12 +436,6 @@ deps =
451436
django-v5.1: Django==5.1rc1
452437
django-latest: Django
453438

454-
# dramatiq
455-
dramatiq-v1.13: dramatiq>=1.13,<1.14
456-
dramatiq-v1.15: dramatiq>=1.15,<1.16
457-
dramatiq-v1.17: dramatiq>=1.17,<1.18
458-
dramatiq-latest: dramatiq
459-
460439
# Falcon
461440
falcon-v1.4: falcon~=1.4.0
462441
falcon-v1: falcon~=1.0
@@ -528,10 +507,6 @@ deps =
528507
httpx-v0.27: httpx~=0.27.0
529508
httpx-latest: httpx
530509

531-
# Huey
532-
huey-v2.0: huey~=2.0.0
533-
huey-latest: huey
534-
535510
# Huggingface Hub
536511
huggingface_hub-v0.22: huggingface_hub~=0.22.2
537512
huggingface_hub-latest: huggingface_hub
@@ -679,14 +654,6 @@ deps =
679654
sanic-v24.6: sanic~=24.6.0
680655
sanic-latest: sanic
681656

682-
# Spark
683-
spark-v3.1: pyspark~=3.1.0
684-
spark-v3.3: pyspark~=3.3.0
685-
spark-v3.5: pyspark~=3.5.0
686-
# TODO: update to ~=4.0.0 once stable is out
687-
spark-v4.0: pyspark==4.0.0.dev2
688-
spark-latest: pyspark
689-
690657
# Starlette
691658
starlette: pytest-asyncio
692659
starlette: python-multipart
@@ -754,6 +721,30 @@ deps =
754721
# These come from the populate_tox.py script. Eventually we should move all
755722
# integration tests there.
756723

724+
# ~~~ Tasks ~~~
725+
celery-v4.4.7: celery==4.4.7
726+
celery-v5.0.5: celery==5.0.5
727+
celery-v5.4.0: celery==5.4.0
728+
celery: newrelic
729+
celery: redis
730+
py3.7-celery: importlib-metadata<5.0
731+
732+
dramatiq-v1.9.0: dramatiq==1.9.0
733+
dramatiq-v1.12.3: dramatiq==1.12.3
734+
dramatiq-v1.15.0: dramatiq==1.15.0
735+
dramatiq-v1.17.1: dramatiq==1.17.1
736+
737+
huey-v2.2.0: huey==2.2.0
738+
huey-v2.3.2: huey==2.3.2
739+
huey-v2.4.5: huey==2.4.5
740+
huey-v2.5.2: huey==2.5.2
741+
742+
spark-v3.0.3: pyspark==3.0.3
743+
spark-v3.2.4: pyspark==3.2.4
744+
spark-v3.4.4: pyspark==3.4.4
745+
spark-v3.5.4: pyspark==3.5.4
746+
747+
757748

758749
setenv =
759750
PYTHONDONTWRITEBYTECODE=1

0 commit comments

Comments
 (0)