diff --git a/.github/workflows/test-integrations-misc.yml b/.github/workflows/test-integrations-misc.yml index 82577c7be6..4e582c6c71 100644 --- a/.github/workflows/test-integrations-misc.yml +++ b/.github/workflows/test-integrations-misc.yml @@ -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/checkout@v4.2.2 - - 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/codecov-action@v5.3.1 - 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 diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py index 402ecf7a82..ac75753825 100644 --- a/scripts/populate_tox/config.py +++ b/scripts/populate_tox/config.py @@ -26,6 +26,9 @@ "launchdarkly": { "package": "launchdarkly-server-sdk", }, + "loguru": { + "package": "loguru", + }, "openfeature": { "package": "openfeature-sdk", }, @@ -41,6 +44,16 @@ "*": ["httpx"], }, }, + "trytond": { + "package": "trytond", + "deps": { + "*": ["werkzeug"], + "<=5.0": ["werkzeug<1.0"], + }, + }, + "typer": { + "package": "typer", + }, "unleash": { "package": "UnleashClient", }, diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py index b8969b8987..73c7277fd2 100644 --- a/scripts/populate_tox/populate_tox.py +++ b/scripts/populate_tox/populate_tox.py @@ -78,7 +78,6 @@ "langchain", "langchain_notiktoken", "litestar", - "loguru", "openai", "openai_notiktoken", "pure_eval", @@ -96,8 +95,6 @@ "starlite", "sqlalchemy", "tornado", - "trytond", - "typer", } diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja index 8086411f7b..06cd50c9a1 100644 --- a/scripts/populate_tox/tox.jinja +++ b/scripts/populate_tox/tox.jinja @@ -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 @@ -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. @@ -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 @@ -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. diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py index f2b02e8b19..d803a0b169 100644 --- a/sentry_sdk/integrations/__init__.py +++ b/sentry_sdk/integrations/__init__.py @@ -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), diff --git a/tox.ini b/tox.ini index b8d1e6a74e..fa6240b094 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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. @@ -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 = @@ -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 @@ -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. @@ -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