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

[3] Move the Misc group over to the tox gen script #3982

Merged
merged 20 commits into from
Feb 13, 2025
+43 −143
Merged

[3] Move the Misc group over to the tox gen script #3982

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 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
d096602
Move Misc 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
3d1e792
remove conf for other integrations
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
6d34169
Merge branch 'ivana/tox-script-4' into ivana/tox-script-12
sentrivana Jan 22, 2025
6fe8e0a
Merge branch 'master' into ivana/tox-script-12
sentrivana Feb 12, 2025
a62a871
ignore trytond
sentrivana Feb 12, 2025
7911b32
Merge branch 'master' into ivana/tox-script-12
sentrivana Feb 13, 2025
88b76fa
add trytond now that the cutoff is gone
sentrivana Feb 13, 2025
180746a
define min version for loguru
sentrivana Feb 13, 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-misc.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.6","3.7","3.8","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
13 changes: 13 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,10 +23,23 @@
"py3.6": ["aiocontextvars"],
},
},
"loguru": {
"package": "loguru",
},
"strawberry": {
"package": "strawberry-graphql[fastapi,flask]",
"deps": {
"*": ["httpx"],
},
},
"trytond": {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm keeping the config around even if the script is not generating stuff for trytond atm. Once we enable it, it should just work out of the box.

"package": "trytond",
"deps": {
"*": ["werkzeug"],
"<=5.0": ["werkzeug<1.0"],
},
},
"typer": {
"package": "typer",
},
}
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 @@ -83,7 +83,6 @@
"langchain_notiktoken",
"launchdarkly",
"litestar",
"loguru",
"openai",
"openai_notiktoken",
"openfeature",
Expand All @@ -103,7 +102,6 @@
"sqlalchemy",
"tornado",
"trytond",
"typer",
"unleash",
}

Expand Down
16 changes: 0 additions & 16 deletions scripts/populate_tox/tox.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,6 @@ envlist =
{py3.8,py3.11,py3.12}-litestar-v{2.12}
{py3.8,py3.11,py3.12}-litestar-latest

# Loguru
{py3.6,py3.11,py3.12}-loguru-v{0.5}
{py3.6,py3.12,py3.13}-loguru-latest

# OpenAI
{py3.9,py3.11,py3.12}-openai-v1.0
{py3.9,py3.11,py3.12}-openai-v1.22
Expand Down Expand Up @@ -276,10 +272,6 @@ envlist =
{py3.8,py3.11,py3.12}-trytond-v{7}
{py3.8,py3.12,py3.13}-trytond-latest

# Typer
{py3.7,py3.12,py3.13}-typer-v{0.15}
{py3.7,py3.12,py3.13}-typer-latest

# Unleash
{py3.8,py3.12,py3.13}-unleash-v6.0.1
{py3.8,py3.12,py3.13}-unleash-latest
Expand Down Expand Up @@ -535,10 +527,6 @@ deps =
litestar-v2.12: litestar~=2.12.0
litestar-latest: litestar

# Loguru
loguru-v0.5: loguru~=0.5.0
loguru-latest: loguru

# OpenAI
openai: pytest-asyncio
openai-v1.0: openai~=1.0.0
Expand Down Expand Up @@ -712,10 +700,6 @@ deps =
trytond-v7: trytond~=7.0
trytond-latest: trytond

# Typer
typer-v0.15: typer~=0.15.0
typer-latest: typer

# === Integrations - Auto-generated ===
# These come from the populate_tox.py script. Eventually we should move all
# integration tests there.
Expand Down
34 changes: 18 additions & 16 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,6 @@ envlist =
{py3.8,py3.11,py3.12}-litestar-v{2.12}
{py3.8,py3.11,py3.12}-litestar-latest

# Loguru
{py3.6,py3.11,py3.12}-loguru-v{0.5}
{py3.6,py3.12,py3.13}-loguru-latest

# OpenAI
{py3.9,py3.11,py3.12}-openai-v1.0
{py3.9,py3.11,py3.12}-openai-v1.22
Expand Down Expand Up @@ -276,10 +272,6 @@ envlist =
{py3.8,py3.11,py3.12}-trytond-v{7}
{py3.8,py3.12,py3.13}-trytond-latest

# Typer
{py3.7,py3.12,py3.13}-typer-v{0.15}
{py3.7,py3.12,py3.13}-typer-latest

# Unleash
{py3.8,py3.12,py3.13}-unleash-v6.0.1
{py3.8,py3.12,py3.13}-unleash-latest
Expand All @@ -306,6 +298,15 @@ envlist =
{py3.9,py3.12,py3.13}-strawberry-v0.259.0


# ~~~ Misc ~~~
{py3.6,py3.7}-loguru-v0.3.2
{py3.6,py3.7,py3.8}-loguru-v0.4.1
{py3.6,py3.7,py3.8}-loguru-v0.5.3
{py3.6,py3.12,py3.13}-loguru-v0.7.3

{py3.7,py3.11,py3.12}-typer-v0.15.1



[testenv]
deps =
Expand Down Expand Up @@ -543,10 +544,6 @@ deps =
litestar-v2.12: litestar~=2.12.0
litestar-latest: litestar

# Loguru
loguru-v0.5: loguru~=0.5.0
loguru-latest: loguru

# OpenAI
openai: pytest-asyncio
openai-v1.0: openai~=1.0.0
Expand Down Expand Up @@ -720,10 +717,6 @@ deps =
trytond-v7: trytond~=7.0
trytond-latest: trytond

# Typer
typer-v0.15: typer~=0.15.0
typer-latest: typer

# === Integrations - Auto-generated ===
# These come from the populate_tox.py script. Eventually we should move all
# integration tests there.
Expand Down Expand Up @@ -755,6 +748,15 @@ deps =
strawberry: httpx


# ~~~ Misc ~~~
loguru-v0.3.2: loguru==0.3.2
loguru-v0.4.1: loguru==0.4.1
loguru-v0.5.3: loguru==0.5.3
loguru-v0.7.3: loguru==0.7.3

typer-v0.15.1: typer==0.15.1



setenv =
PYTHONDONTWRITEBYTECODE=1
Expand Down
Loading