Merge branch 'master' into ivana/populate-tox-2

Author: sentrivana

CONTRIBUTING.md

@@ -126,7 +126,7 @@ pytest -rs tests/integrations/flask/  # Replace "flask" with the specific integr
 
 ## Releasing a New Version
 
-_(only relevant for Sentry employees)_
+_(only relevant for Python SDK core team)_
 
 ### Prerequisites
 

sentry_sdk/integrations/__init__.py

@@ -119,12 +119,36 @@ def iter_default_integrations(with_auto_enabling_integrations):
 del _generate_default_integrations_iterator
 
 _MIN_VERSIONS = {
-    'aiohttp': (3, 4),
-    'anthropic': (0, 16),
-    'ariadne': (0, 20),
-    'arq': (0, 23),
-    'asyncpg': (0, 23),
-    'boto3': (1, 12),   # this is actually the botocore version
+    "aiohttp": (3, 4),
+    "anthropic": (0, 16),
+    "ariadne": (0, 20),
+    "arq": (0, 23),
+    "asyncpg": (0, 23),
+    "boto3": (1, 12),  # this is actually the botocore version
+    "bottle": (0, 12),
+    "celery": (4, 4, 7),
+    "clickhouse_driver": (0, 2, 0),
+    "django": (1, 8),
+    "falcon": (1, 4),
+    "flask": (0, 10),
+    "gql": (3, 4, 1),
+    "graphene": (3, 3),
+    "ray": (2, 7, 0),
+    "rq": (0, 6),
+    "sanic": (0, 8),
+    "sqlalchemy": (1, 2),
+    "strawberry": (0, 209, 5),
+    "tornado": (6, 0),
+}
+
+
+_MIN_VERSIONS = {
+    "aiohttp": (3, 4),
+    "anthropic": (0, 16),
+    "ariadne": (0, 20),
+    "arq": (0, 23),
+    "asyncpg": (0, 23),
+    "boto3": (1, 12),  # this is actually the botocore version
     "bottle": (0, 12),
     "celery": (4, 4, 7),
     "clickhouse_driver": (0, 2, 0),
@@ -218,18 +242,20 @@ def setup_integrations(
 
 
 def _check_minimum_version(integration, version, package=None):
-    # type: (Integration, Optional[tuple[int]], Optional[str]) -> None
+    # type: (type[Integration], Optional[tuple[int, ...]], Optional[str]) -> None
     package = package or integration.identifier
 
     if version is None:
-        raise DidNotEnable(f"Unparsable {package} version: {version}")
+        raise DidNotEnable(f"Unparsable {package} version.")
 
     min_version = _MIN_VERSIONS.get(integration.identifier)
     if min_version is None:
         return
 
     if version < min_version:
-        raise DidNotEnable(f"Integration only supports {package} {'.'.join(map(str, min_version))} or newer.")
+        raise DidNotEnable(
+            f"Integration only supports {package} {'.'.join(map(str, min_version))} or newer."
+        )
 
 
 class DidNotEnable(Exception):  # noqa: N818

sentry_sdk/integrations/anthropic.py

@@ -4,7 +4,7 @@
 import sentry_sdk
 from sentry_sdk.ai.monitoring import record_token_usage
 from sentry_sdk.consts import OP, SPANDATA
-from sentry_sdk.integrations import _MIN_VERSIONS, DidNotEnable, Integration
+from sentry_sdk.integrations import _check_minimum_version, DidNotEnable, Integration
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.utils import (
     capture_internal_exceptions,
@@ -37,13 +37,7 @@ def __init__(self, include_prompts=True):
     def setup_once():
         # type: () -> None
         version = package_version("anthropic")
-
-        if version is None:
-            raise DidNotEnable("Unparsable anthropic version.")
-
-        min_version = _MIN_VERSIONS[AnthropicIntegration.identifier]
-        if version < min_version:
-            raise DidNotEnable(f"anthropic {'.'.join(map(str, min_version))} or newer required.")
+        _check_minimum_version(AnthropicIntegration, version)
 
         Messages.create = _wrap_message_create(Messages.create)
         AsyncMessages.create = _wrap_message_create_async(AsyncMessages.create)

sentry_sdk/integrations/asyncpg.py

@@ -33,7 +33,6 @@ def __init__(self, *, record_params: bool = False):
     def setup_once() -> None:
         # asyncpg.__version__ is a string containing the semantic version in the form of "<major>.<minor>.<patch>"
         asyncpg_version = parse_version(asyncpg.__version__)
-
         _check_minimum_version(AsyncPGIntegration, asyncpg_version)
 
         asyncpg.Connection.execute = _wrap_execute(

sentry_sdk/integrations/boto3.py

@@ -36,7 +36,7 @@ class Boto3Integration(Integration):
     def setup_once():
         # type: () -> None
         version = parse_version(BOTOCORE_VERSION)
-        _check_minimum_version(Boto3Integration, version, 'botocore')
+        _check_minimum_version(Boto3Integration, version, "botocore")
 
         orig_init = BaseClient.__init__
 

sentry_sdk/integrations/clickhouse_driver.py

@@ -35,7 +35,6 @@ def __getitem__(self, _):
     raise DidNotEnable("clickhouse-driver not installed.")
 
 
-
 class ClickhouseDriverIntegration(Integration):
     identifier = "clickhouse_driver"
     origin = f"auto.db.{identifier}"

sentry_sdk/integrations/sanic.py

@@ -73,9 +73,8 @@ def __init__(self, unsampled_statuses=frozenset({404})):
     @staticmethod
     def setup_once():
         # type: () -> None
-
         SanicIntegration.version = parse_version(SANIC_VERSION)
-        _check_minimum_version(SanicIntegration.identifier, SanicIntegration.version)
+        _check_minimum_version(SanicIntegration, SanicIntegration.version)
 
         if not HAS_REAL_CONTEXTVARS:
             # We better have contextvars or we're going to leak state between
@@ -97,7 +96,7 @@ def setup_once():
             # https://github.com/huge-success/sanic/issues/1332
             ignore_logger("root")
 
-        if SanicIntegration.version < (21, 9):
+        if SanicIntegration.version is not None and SanicIntegration.version < (21, 9):
             _setup_legacy_sanic()
             return