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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 0 additions & 76 deletions .github/workflows/test-integrations-misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,82 +22,6 @@ env:
CACHED_BUILD_PATHS: |
${{ github.workspace }}/dist-serverless
jobs:
test-misc-latest:
name: Misc (latest)
timeout-minutes: 30
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","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
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true
- name: Setup Test Env
run: |
pip install "coverage[toml]" tox
- name: Erase coverage
run: |
coverage erase
- name: Test loguru latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-loguru-latest"
- name: Test opentelemetry latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-opentelemetry-latest"
- name: Test potel latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-potel-latest"
- name: Test pure_eval latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-pure_eval-latest"
- name: Test trytond latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-trytond-latest"
- name: Test typer latest
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-typer-latest"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
run: |
coverage combine .coverage-sentry-*
coverage xml
- name: Upload coverage to Codecov
if: ${{ !cancelled() }}
uses: codecov/[email protected]
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage.xml
# make sure no plugins alter our coverage reports
plugin: noop
verbose: true
- name: Upload test results to Codecov
if: ${{ !cancelled() }}
uses: codecov/test-results-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: .junitxml
verbose: true
test-misc-pinned:
name: Misc (pinned)
timeout-minutes: 30
Expand Down
13 changes: 13 additions & 0 deletions scripts/populate_tox/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"launchdarkly": {
"package": "launchdarkly-server-sdk",
},
"loguru": {
"package": "loguru",
},
"openfeature": {
"package": "openfeature-sdk",
},
Expand All @@ -41,6 +44,16 @@
"*": ["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",
},
"unleash": {
"package": "UnleashClient",
},
Expand Down
3 changes: 0 additions & 3 deletions scripts/populate_tox/populate_tox.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
"langchain",
"langchain_notiktoken",
"litestar",
"loguru",
"openai",
"openai_notiktoken",
"pure_eval",
Expand All @@ -96,8 +95,6 @@
"starlite",
"sqlalchemy",
"tornado",
"trytond",
"typer",
}


Expand Down
32 changes: 0 additions & 32 deletions scripts/populate_tox/tox.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,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 @@ -261,17 +257,6 @@ envlist =
{py3.8,py3.11,py3.12}-tornado-v{6.2}
{py3.8,py3.11,py3.12}-tornado-latest

# Trytond
{py3.6}-trytond-v{4}
{py3.6,py3.8}-trytond-v{5}
{py3.6,py3.11}-trytond-v{6}
{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

# === Integrations - Auto-generated ===
# These come from the populate_tox.py script. Eventually we should move all
# integration tests there.
Expand Down Expand Up @@ -523,10 +508,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 @@ -679,19 +660,6 @@ deps =
tornado-v6.2: tornado~=6.2.0
tornado-latest: tornado

# Trytond
trytond: werkzeug
trytond-v4: werkzeug<1.0
trytond-v4: trytond~=4.0
trytond-v5: trytond~=5.0
trytond-v6: trytond~=6.0
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
1 change: 1 addition & 0 deletions sentry_sdk/integrations/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ def iter_default_integrations(with_auto_enabling_integrations):
"huggingface_hub": (0, 22),
"langchain": (0, 0, 210),
"launchdarkly": (9, 8, 0),
"loguru": (0, 7, 0),
"openai": (1, 0, 0),
"openfeature": (0, 7, 1),
"quart": (0, 16, 0),
Expand Down
61 changes: 29 additions & 32 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,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 @@ -261,17 +257,6 @@ envlist =
{py3.8,py3.11,py3.12}-tornado-v{6.2}
{py3.8,py3.11,py3.12}-tornado-latest

# Trytond
{py3.6}-trytond-v{4}
{py3.6,py3.8}-trytond-v{5}
{py3.6,py3.11}-trytond-v{6}
{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

# === Integrations - Auto-generated ===
# These come from the populate_tox.py script. Eventually we should move all
# integration tests there.
Expand Down Expand Up @@ -308,6 +293,19 @@ envlist =
{py3.9,py3.12,py3.13}-strawberry-v0.260.1


# ~~~ Misc ~~~
{py3.6,py3.12,py3.13}-loguru-v0.7.3

{py3.6}-trytond-v4.6.9
{py3.6}-trytond-v4.8.18
{py3.6,py3.7,py3.8}-trytond-v5.8.16
{py3.8,py3.10,py3.11}-trytond-v6.8.17
{py3.8,py3.11,py3.12}-trytond-v7.0.9
{py3.8,py3.11,py3.12}-trytond-v7.4.5

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



[testenv]
deps =
Expand Down Expand Up @@ -545,10 +543,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 @@ -701,19 +695,6 @@ deps =
tornado-v6.2: tornado~=6.2.0
tornado-latest: tornado

# Trytond
trytond: werkzeug
trytond-v4: werkzeug<1.0
trytond-v4: trytond~=4.0
trytond-v5: trytond~=5.0
trytond-v6: trytond~=6.0
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 @@ -760,6 +741,22 @@ deps =
strawberry: httpx


# ~~~ Misc ~~~
loguru-v0.7.3: loguru==0.7.3

trytond-v4.6.9: trytond==4.6.9
trytond-v4.8.18: trytond==4.8.18
trytond-v5.8.16: trytond==5.8.16
trytond-v6.8.17: trytond==6.8.17
trytond-v7.0.9: trytond==7.0.9
trytond-v7.4.5: trytond==7.4.5
trytond: werkzeug
trytond-v4.6.9: werkzeug<1.0
trytond-v4.8.18: werkzeug<1.0

typer-v0.15.1: typer==0.15.1



setenv =
PYTHONDONTWRITEBYTECODE=1
Expand Down
Loading