Skip to content
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.

Sign up for GitHub

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

[9] Move the Network group over to the tox gen script #3979

Merged
merged 19 commits into from
Feb 14, 2025
Merged

[9] Move the Network group over to the tox gen script #3979

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4f0b90c
Add tox generation script, but don't use it yet
sentrivana Jan 20, 2025
c2c6450
add missing file
sentrivana Jan 20, 2025
3ac285d
Add more min versions
sentrivana Jan 20, 2025
840cc72
Move Network to toxgen
sentrivana Jan 20, 2025
6b9417f
capitalization
sentrivana Jan 20, 2025
c971981
comment
sentrivana Jan 20, 2025
c2d59ae
explicit none check
sentrivana Jan 20, 2025
65cc78c
Merge branch 'master' into ivana/tox-script-1
sentrivana Jan 21, 2025
efaa55f
Apply suggestions from code review
sentrivana Jan 22, 2025
474c679
better readme structure
sentrivana Jan 22, 2025
8904a1b
remove test suite config
sentrivana Jan 22, 2025
8572489
dont require deps
sentrivana Jan 22, 2025
b907e69
Merge branch 'ivana/tox-script-1' into ivana/tox-script-4
sentrivana Jan 22, 2025
984f423
Merge branch 'ivana/tox-script-4' into ivana/tox-script-9
sentrivana Jan 22, 2025
0a94a13
config
sentrivana Jan 22, 2025
30a6fbd
Merge branch 'master' into ivana/tox-script-9
sentrivana Feb 12, 2025
11e199f
Merge branch 'master' into ivana/tox-script-9
sentrivana Feb 14, 2025
2c89fec
Merge branch 'master' into ivana/tox-script-9
sentrivana Feb 14, 2025
f11c049
remove requests for now
sentrivana Feb 14, 2025
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-network.yml
View file
Open in desktop
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.9","3.11","3.12","3.13"]
python-version: ["3.9","3.12","3.13"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we be concerned that tests for 3.8 and 3.11 are gone?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same reply as in the other PRs -- we're shrinking the Latest group by taking stuff out of it. So this is ok. It's all moving into the Pinned group instead.

# 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
10 changes: 10 additions & 0 deletions scripts/populate_tox/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@
"py3.6": ["aiocontextvars"],
},
},
"grpc": {
"package": "grpcio",
"deps": {
"*": ["protobuf", "mypy-protobuf", "types-protobuf", "pytest-asyncio"],
},
"python": ">=3.7",
},
"requests": {
"package": "requests",
},
"strawberry": {
"package": "strawberry-graphql[fastapi,flask]",
"deps": {
Expand Down
2 changes: 0 additions & 2 deletions scripts/populate_tox/populate_tox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
"fastapi",
"flask",
"gcp",
"grpc",
"httpx",
"huey",
"huggingface_hub",
Expand All @@ -94,7 +93,6 @@
"ray",
"redis",
"redis_py_cluster_legacy",
"requests",
"rq",
"sanic",
"spark",
Expand Down
22 changes: 0 additions & 22 deletions scripts/populate_tox/tox.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,6 @@ envlist =
# GCP
{py3.7}-gcp

# gRPC
{py3.7,py3.9}-grpc-v{1.39}
{py3.7,py3.10}-grpc-v{1.49}
{py3.7,py3.11}-grpc-v{1.59}
{py3.8,py3.11,py3.12}-grpc-latest

# HTTPX
{py3.6,py3.9}-httpx-v{0.16,0.18}
{py3.6,py3.10}-httpx-v{0.20,0.22}
Expand Down Expand Up @@ -229,9 +223,6 @@ envlist =
{py3.6,py3.8}-redis_py_cluster_legacy-v{1,2}
# no -latest, not developed anymore

# Requests
{py3.6,py3.8,py3.12,py3.13}-requests

# RQ (Redis Queue)
{py3.6}-rq-v{0.6}
{py3.6,py3.9}-rq-v{0.13,1.0}
Expand Down Expand Up @@ -471,16 +462,6 @@ deps =
flask-v3: Flask~=3.0
flask-latest: Flask

# gRPC
grpc: protobuf
grpc: mypy-protobuf
grpc: types-protobuf
grpc: pytest-asyncio
grpc-v1.39: grpcio~=1.39.0
grpc-v1.49: grpcio~=1.49.1
grpc-v1.59: grpcio~=1.59.0
grpc-latest: grpcio

# HTTPX
httpx-v0.16: pytest-httpx==0.10.0
httpx-v0.18: pytest-httpx==0.12.0
Expand Down Expand Up @@ -621,9 +602,6 @@ deps =
redis_py_cluster_legacy-v1: redis-py-cluster~=1.0
redis_py_cluster_legacy-v2: redis-py-cluster~=2.0

# Requests
requests: requests>=2.0

# RQ (Redis Queue)
# https://github.com/jamesls/fakeredis/issues/245
rq-v{0.6}: fakeredis<1.0
Expand Down
50 changes: 28 additions & 22 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,6 @@ envlist =
# GCP
{py3.7}-gcp

# gRPC
{py3.7,py3.9}-grpc-v{1.39}
{py3.7,py3.10}-grpc-v{1.49}
{py3.7,py3.11}-grpc-v{1.59}
{py3.8,py3.11,py3.12}-grpc-latest

# HTTPX
{py3.6,py3.9}-httpx-v{0.16,0.18}
{py3.6,py3.10}-httpx-v{0.20,0.22}
Expand Down Expand Up @@ -229,9 +223,6 @@ envlist =
{py3.6,py3.8}-redis_py_cluster_legacy-v{1,2}
# no -latest, not developed anymore

# Requests
{py3.6,py3.8,py3.12,py3.13}-requests

# RQ (Redis Queue)
{py3.6}-rq-v{0.6}
{py3.6,py3.9}-rq-v{0.13,1.0}
Expand Down Expand Up @@ -306,6 +297,18 @@ envlist =
{py3.9,py3.12,py3.13}-strawberry-v0.259.0


# ~~~ Network ~~~
{py3.7,py3.8}-grpc-v1.32.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the .github/workflows, we don't have either of these Python versions. Is that because the line changed in this PR is for the latest tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you have to look at Python versions in the Pinned group instead, that's what gets generated by this script.

{py3.7,py3.9,py3.10}-grpc-v1.44.0
{py3.7,py3.10,py3.11}-grpc-v1.58.3
{py3.8,py3.12,py3.13}-grpc-v1.70.0

{py3.6,py3.7,py3.8}-requests-v2.23.0
{py3.6,py3.8,py3.9}-requests-v2.26.0
{py3.7,py3.10,py3.11}-requests-v2.29.0
{py3.8,py3.11,py3.12}-requests-v2.32.3



[testenv]
deps =
Expand Down Expand Up @@ -479,16 +482,6 @@ deps =
flask-v3: Flask~=3.0
flask-latest: Flask

# gRPC
grpc: protobuf
grpc: mypy-protobuf
grpc: types-protobuf
grpc: pytest-asyncio
grpc-v1.39: grpcio~=1.39.0
grpc-v1.49: grpcio~=1.49.1
grpc-v1.59: grpcio~=1.59.0
grpc-latest: grpcio

# HTTPX
httpx-v0.16: pytest-httpx==0.10.0
httpx-v0.18: pytest-httpx==0.12.0
Expand Down Expand Up @@ -629,9 +622,6 @@ deps =
redis_py_cluster_legacy-v1: redis-py-cluster~=1.0
redis_py_cluster_legacy-v2: redis-py-cluster~=2.0

# Requests
requests: requests>=2.0

# RQ (Redis Queue)
# https://github.com/jamesls/fakeredis/issues/245
rq-v{0.6}: fakeredis<1.0
Expand Down Expand Up @@ -755,6 +745,22 @@ deps =
strawberry: httpx


# ~~~ Network ~~~
grpc-v1.32.0: grpcio==1.32.0
grpc-v1.44.0: grpcio==1.44.0
grpc-v1.58.3: grpcio==1.58.3
grpc-v1.70.0: grpcio==1.70.0
grpc: protobuf
grpc: mypy-protobuf
grpc: types-protobuf
grpc: pytest-asyncio

requests-v2.23.0: requests==2.23.0
requests-v2.26.0: requests==2.26.0
requests-v2.29.0: requests==2.29.0
requests-v2.32.3: requests==2.32.3



setenv =
PYTHONDONTWRITEBYTECODE=1
Expand Down
Loading