Skip to content

Commit 840cc72

Browse files
committed
Move Network to toxgen
1 parent 3ac285d commit 840cc72

File tree

4 files changed

+29
-47
lines changed

4 files changed

+29
-47
lines changed

.github/workflows/test-integrations-network.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.9","3.11","3.12","3.13"]
32+
python-version: ["3.9","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/populate_tox.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
"gcp",
7777
"gql",
7878
"graphene",
79-
"grpc",
8079
"httpx",
8180
"huey",
8281
"huggingface_hub",
@@ -95,7 +94,6 @@
9594
"ray",
9695
"redis",
9796
"redis_py_cluster_legacy",
98-
"requests",
9997
"rq",
10098
"sanic",
10199
"spark",

scripts/populate_tox/tox.jinja

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,6 @@ envlist =
148148
{py3.7,py3.11}-graphene-v{3.3}
149149
{py3.7,py3.12,py3.13}-graphene-latest
150150

151-
# gRPC
152-
{py3.7,py3.9}-grpc-v{1.39}
153-
{py3.7,py3.10}-grpc-v{1.49}
154-
{py3.7,py3.11}-grpc-v{1.59}
155-
{py3.8,py3.11,py3.12}-grpc-latest
156-
157151
# HTTPX
158152
{py3.6,py3.9}-httpx-v{0.16,0.18}
159153
{py3.6,py3.10}-httpx-v{0.20,0.22}
@@ -241,9 +235,6 @@ envlist =
241235
{py3.6,py3.8}-redis_py_cluster_legacy-v{1,2}
242236
# no -latest, not developed anymore
243237

244-
# Requests
245-
{py3.6,py3.8,py3.12,py3.13}-requests
246-
247238
# RQ (Redis Queue)
248239
{py3.6}-rq-v{0.6}
249240
{py3.6,py3.9}-rq-v{0.13,1.0}
@@ -507,16 +498,6 @@ deps =
507498
graphene-v{3.3}: graphene~=3.3.0
508499
graphene-latest: graphene
509500
510-
# gRPC
511-
grpc: protobuf
512-
grpc: mypy-protobuf
513-
grpc: types-protobuf
514-
grpc: pytest-asyncio
515-
grpc-v1.39: grpcio~=1.39.0
516-
grpc-v1.49: grpcio~=1.49.1
517-
grpc-v1.59: grpcio~=1.59.0
518-
grpc-latest: grpcio
519-
520501
# HTTPX
521502
httpx-v0.16: pytest-httpx==0.10.0
522503
httpx-v0.18: pytest-httpx==0.12.0
@@ -657,9 +638,6 @@ deps =
657638
redis_py_cluster_legacy-v1: redis-py-cluster~=1.0
658639
redis_py_cluster_legacy-v2: redis-py-cluster~=2.0
659640
660-
# Requests
661-
requests: requests>=2.0
662-
663641
# RQ (Redis Queue)
664642
# https://github.com/jamesls/fakeredis/issues/245
665643
rq-v{0.6}: fakeredis<1.0

tox.ini

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,6 @@ envlist =
148148
{py3.7,py3.11}-graphene-v{3.3}
149149
{py3.7,py3.12,py3.13}-graphene-latest
150150

151-
# gRPC
152-
{py3.7,py3.9}-grpc-v{1.39}
153-
{py3.7,py3.10}-grpc-v{1.49}
154-
{py3.7,py3.11}-grpc-v{1.59}
155-
{py3.8,py3.11,py3.12}-grpc-latest
156-
157151
# HTTPX
158152
{py3.6,py3.9}-httpx-v{0.16,0.18}
159153
{py3.6,py3.10}-httpx-v{0.20,0.22}
@@ -241,9 +235,6 @@ envlist =
241235
{py3.6,py3.8}-redis_py_cluster_legacy-v{1,2}
242236
# no -latest, not developed anymore
243237

244-
# Requests
245-
{py3.6,py3.8,py3.12,py3.13}-requests
246-
247238
# RQ (Redis Queue)
248239
{py3.6}-rq-v{0.6}
249240
{py3.6,py3.9}-rq-v{0.13,1.0}
@@ -305,6 +296,18 @@ envlist =
305296
# These come from the populate_tox.py script. Eventually we should move all
306297
# integration tests there.
307298

299+
# ~~~ Network ~~~
300+
{py3.7,py3.8}-grpc-v1.32.0
301+
{py3.7,py3.9,py3.10}-grpc-v1.44.0
302+
{py3.7,py3.10,py3.11}-grpc-v1.58.3
303+
{py3.8,py3.12,py3.13}-grpc-v1.69.0
304+
305+
{py3.6,py3.7,py3.8}-requests-v2.23.0
306+
{py3.6,py3.8,py3.9}-requests-v2.26.0
307+
{py3.7,py3.10,py3.11}-requests-v2.29.0
308+
{py3.8,py3.11,py3.12}-requests-v2.32.3
309+
310+
308311

309312
[testenv]
310313
deps =
@@ -497,16 +500,6 @@ deps =
497500
graphene-v{3.3}: graphene~=3.3.0
498501
graphene-latest: graphene
499502

500-
# gRPC
501-
grpc: protobuf
502-
grpc: mypy-protobuf
503-
grpc: types-protobuf
504-
grpc: pytest-asyncio
505-
grpc-v1.39: grpcio~=1.39.0
506-
grpc-v1.49: grpcio~=1.49.1
507-
grpc-v1.59: grpcio~=1.59.0
508-
grpc-latest: grpcio
509-
510503
# HTTPX
511504
httpx-v0.16: pytest-httpx==0.10.0
512505
httpx-v0.18: pytest-httpx==0.12.0
@@ -647,9 +640,6 @@ deps =
647640
redis_py_cluster_legacy-v1: redis-py-cluster~=1.0
648641
redis_py_cluster_legacy-v2: redis-py-cluster~=2.0
649642

650-
# Requests
651-
requests: requests>=2.0
652-
653643
# RQ (Redis Queue)
654644
# https://github.com/jamesls/fakeredis/issues/245
655645
rq-v{0.6}: fakeredis<1.0
@@ -754,6 +744,22 @@ deps =
754744
# These come from the populate_tox.py script. Eventually we should move all
755745
# integration tests there.
756746

747+
# ~~~ Network ~~~
748+
grpc-v1.32.0: grpcio==1.32.0
749+
grpc-v1.44.0: grpcio==1.44.0
750+
grpc-v1.58.3: grpcio==1.58.3
751+
grpc-v1.69.0: grpcio==1.69.0
752+
grpc: protobuf
753+
grpc: mypy-protobuf
754+
grpc: types-protobuf
755+
grpc: pytest-asyncio
756+
757+
requests-v2.23.0: requests==2.23.0
758+
requests-v2.26.0: requests==2.26.0
759+
requests-v2.29.0: requests==2.29.0
760+
requests-v2.32.3: requests==2.32.3
761+
762+
757763

758764
setenv =
759765
PYTHONDONTWRITEBYTECODE=1

0 commit comments

Comments
 (0)