Skip to content

Commit 912c981

Browse files
committed
celery, flask
1 parent 30effcf commit 912c981

File tree

5 files changed

+56
-88
lines changed

5 files changed

+56
-88
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
"requests",
156156
]
157157
},
158+
"python": ">=3.7",
158159
},
159160
"flask": {
160161
"package": "flask",

scripts/populate_tox/populate_tox.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,13 @@
5252
"aws_lambda",
5353
"beam",
5454
"boto3",
55-
"celery",
5655
"chalice",
5756
"cohere",
5857
"common",
5958
"cloud_resource_context",
6059
"django",
6160
"dramatiq",
62-
"flask",
61+
"fastapi",
6362
"gcp",
6463
"gevent",
6564
"gql",

scripts/populate_tox/tox.jinja

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ envlist =
6767
{py3.11,py3.12}-boto3-v{1.34}
6868
{py3.11,py3.12,py3.13}-boto3-latest
6969

70-
# Celery
71-
{py3.6,py3.8}-celery-v{4}
72-
{py3.6,py3.8}-celery-v{5.0}
73-
{py3.7,py3.10}-celery-v{5.1,5.2}
74-
{py3.8,py3.11,py3.12}-celery-v{5.3,5.4,5.5}
75-
{py3.8,py3.12,py3.13}-celery-latest
76-
7770
# Chalice
7871
{py3.6,py3.9}-chalice-v{1.16}
7972
{py3.8,py3.12,py3.13}-chalice-latest
@@ -106,11 +99,9 @@ envlist =
10699
{py3.8,py3.11,py3.12}-dramatiq-v{1.17}
107100
{py3.8,py3.11,py3.12}-dramatiq-latest
108101

109-
# Flask
110-
{py3.6,py3.8}-flask-v{1}
111-
{py3.8,py3.11,py3.12}-flask-v{2}
112-
{py3.10,py3.11,py3.12}-flask-v{3}
113-
{py3.10,py3.12,py3.13}-flask-latest
102+
# FastAPI
103+
{py3.7,py3.10}-fastapi-v{0.79}
104+
{py3.8,py3.12,py3.13}-fastapi-latest
114105

115106
# GCP
116107
{py3.7}-gcp
@@ -366,21 +357,6 @@ deps =
366357
boto3-v1.34: boto3~=1.34.0
367358
boto3-latest: boto3
368359
369-
# Celery
370-
celery: redis
371-
celery-v4: Celery~=4.0
372-
celery-v5.0: Celery~=5.0.0
373-
celery-v5.1: Celery~=5.1.0
374-
celery-v5.2: Celery~=5.2.0
375-
celery-v5.3: Celery~=5.3.0
376-
celery-v5.4: Celery~=5.4.0
377-
# TODO: update when stable is out
378-
celery-v5.5: Celery==5.5.0rc3
379-
celery-latest: Celery
380-
381-
celery: newrelic
382-
{py3.7}-celery: importlib-metadata<5.0
383-
384360
# Chalice
385361
chalice: pytest-chalice==0.0.5
386362
chalice-v1.16: chalice~=1.16.0
@@ -425,15 +401,15 @@ deps =
425401
dramatiq-v1.17: dramatiq>=1.17,<1.18
426402
dramatiq-latest: dramatiq
427403
428-
# Flask
429-
flask: flask-login
430-
flask-v{1,2.0}: Werkzeug<2.1.0
431-
flask-v{1,2.0}: markupsafe<2.1.0
432-
flask-v{3}: Werkzeug
433-
flask-v1: Flask~=1.0
434-
flask-v2: Flask~=2.0
435-
flask-v3: Flask~=3.0
436-
flask-latest: Flask
404+
# FastAPI
405+
fastapi: httpx
406+
# (this is a dependency of httpx)
407+
fastapi: anyio<4.0.0
408+
fastapi: pytest-asyncio
409+
fastapi: python-multipart
410+
fastapi: requests
411+
fastapi-v{0.79}: fastapi~=0.79.0
412+
fastapi-latest: fastapi
437413
438414
# GQL
439415
gql-v{3.4}: gql[all]~=3.4.0

tox.ini

Lines changed: 41 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ envlist =
6767
{py3.11,py3.12}-boto3-v{1.34}
6868
{py3.11,py3.12,py3.13}-boto3-latest
6969

70-
# Celery
71-
{py3.6,py3.8}-celery-v{4}
72-
{py3.6,py3.8}-celery-v{5.0}
73-
{py3.7,py3.10}-celery-v{5.1,5.2}
74-
{py3.8,py3.11,py3.12}-celery-v{5.3,5.4,5.5}
75-
{py3.8,py3.12,py3.13}-celery-latest
76-
7770
# Chalice
7871
{py3.6,py3.9}-chalice-v{1.16}
7972
{py3.8,py3.12,py3.13}-chalice-latest
@@ -106,11 +99,9 @@ envlist =
10699
{py3.8,py3.11,py3.12}-dramatiq-v{1.17}
107100
{py3.8,py3.11,py3.12}-dramatiq-latest
108101

109-
# Flask
110-
{py3.6,py3.8}-flask-v{1}
111-
{py3.8,py3.11,py3.12}-flask-v{2}
112-
{py3.10,py3.11,py3.12}-flask-v{3}
113-
{py3.10,py3.12,py3.13}-flask-latest
102+
# FastAPI
103+
{py3.7,py3.10}-fastapi-v{0.79}
104+
{py3.8,py3.12,py3.13}-fastapi-latest
114105

115106
# GCP
116107
{py3.7}-gcp
@@ -290,11 +281,17 @@ envlist =
290281
{py3.8,py3.11,py3.12}-ariadne-v0.24.0
291282

292283

284+
# ~~~ Tasks ~~~
285+
{py3.6,py3.7,py3.8}-celery-v4.4.7
286+
{py3.6,py3.7,py3.8}-celery-v5.0.5
287+
{py3.8,py3.11,py3.12}-celery-v5.4.0
288+
289+
293290
# ~~~ Web 1 ~~~
294-
{py3.6,py3.9,py3.10}-fastapi-v0.79.1
295-
{py3.7,py3.10,py3.11}-fastapi-v0.91.0
296-
{py3.7,py3.10,py3.11}-fastapi-v0.103.2
297-
{py3.8,py3.11,py3.12}-fastapi-v0.115.6
291+
{py3.6,py3.7,py3.8}-flask-v1.1.4
292+
{py3.8,py3.12,py3.13}-flask-v2.3.3
293+
{py3.8,py3.12,py3.13}-flask-v3.0.3
294+
{py3.9,py3.12,py3.13}-flask-v3.1.0
298295

299296

300297
# ~~~ Web 2 ~~~
@@ -383,21 +380,6 @@ deps =
383380
boto3-v1.34: boto3~=1.34.0
384381
boto3-latest: boto3
385382

386-
# Celery
387-
celery: redis
388-
celery-v4: Celery~=4.0
389-
celery-v5.0: Celery~=5.0.0
390-
celery-v5.1: Celery~=5.1.0
391-
celery-v5.2: Celery~=5.2.0
392-
celery-v5.3: Celery~=5.3.0
393-
celery-v5.4: Celery~=5.4.0
394-
# TODO: update when stable is out
395-
celery-v5.5: Celery==5.5.0rc4
396-
celery-latest: Celery
397-
398-
celery: newrelic
399-
{py3.7}-celery: importlib-metadata<5.0
400-
401383
# Chalice
402384
chalice: pytest-chalice==0.0.5
403385
chalice-v1.16: chalice~=1.16.0
@@ -442,15 +424,15 @@ deps =
442424
dramatiq-v1.17: dramatiq>=1.17,<1.18
443425
dramatiq-latest: dramatiq
444426

445-
# Flask
446-
flask: flask-login
447-
flask-v{1,2.0}: Werkzeug<2.1.0
448-
flask-v{1,2.0}: markupsafe<2.1.0
449-
flask-v{3}: Werkzeug
450-
flask-v1: Flask~=1.0
451-
flask-v2: Flask~=2.0
452-
flask-v3: Flask~=3.0
453-
flask-latest: Flask
427+
# FastAPI
428+
fastapi: httpx
429+
# (this is a dependency of httpx)
430+
fastapi: anyio<4.0.0
431+
fastapi: pytest-asyncio
432+
fastapi: python-multipart
433+
fastapi: requests
434+
fastapi-v{0.79}: fastapi~=0.79.0
435+
fastapi-latest: fastapi
454436

455437
# GQL
456438
gql-v{3.4}: gql[all]~=3.4.0
@@ -734,16 +716,26 @@ deps =
734716
ariadne: httpx
735717

736718

719+
# ~~~ Tasks ~~~
720+
celery-v4.4.7: celery==4.4.7
721+
celery-v5.0.5: celery==5.0.5
722+
celery-v5.4.0: celery==5.4.0
723+
celery: newrelic
724+
celery: redis
725+
py3.7-celery: importlib-metata<5.0
726+
727+
737728
# ~~~ Web 1 ~~~
738-
fastapi-v0.79.1: fastapi==0.79.1
739-
fastapi-v0.91.0: fastapi==0.91.0
740-
fastapi-v0.103.2: fastapi==0.103.2
741-
fastapi-v0.115.6: fastapi==0.115.6
742-
fastapi: httpx
743-
fastapi: anyio<4.0.0
744-
fastapi: python-multipart
745-
fastapi: pytest-asyncio
746-
fastapi: requests
729+
flask-v1.1.4: flask==1.1.4
730+
flask-v2.3.3: flask==2.3.3
731+
flask-v3.0.3: flask==3.0.3
732+
flask-v3.1.0: flask==3.1.0
733+
flask: flask-login
734+
flask: werkzeug
735+
flask-v1.1.4: werkzeug<2.1.0
736+
flask-v1.1.4: markupsafe<2.1.0
737+
flask-v2.3.3: werkzeug<2.1.0
738+
flask-v2.3.3: markupsafe<2.1.0
747739

748740

749741
# ~~~ Web 2 ~~~

0 commit comments

Comments
 (0)