Merge branch 'master' into antonpirker/anthropic-messages

Author: antonpirker

scripts/populate_tox/tox.jinja

@@ -134,6 +134,7 @@ deps =
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
     gevent: pytest-asyncio
     {py3.10,py3.11}-gevent: zope.event<5.0.0
+    {py3.10,py3.11}-gevent: zope.interface<8.0
 
     # === Integrations ===
 

sentry_sdk/ai/utils.py

@@ -44,6 +44,6 @@ def get_start_span_function():
     # type: () -> Callable[..., Any]
     current_span = sentry_sdk.get_current_span()
     transaction_exists = (
-        current_span is not None and current_span.containing_transaction == current_span
+        current_span is not None and current_span.containing_transaction is not None
     )
     return sentry_sdk.start_span if transaction_exists else sentry_sdk.start_transaction

sentry_sdk/integrations/threading.py

@@ -52,7 +52,7 @@ def setup_once():
 
         try:
             from django import VERSION as django_version  # noqa: N811
-            import channels  # type: ignore[import-not-found]
+            import channels  # type: ignore[import-untyped]
 
             channels_version = channels.__version__
         except ImportError:

tox.ini

@@ -358,6 +358,7 @@ deps =
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
     gevent: pytest-asyncio
     {py3.10,py3.11}-gevent: zope.event<5.0.0
+    {py3.10,py3.11}-gevent: zope.interface<8.0
 
     # === Integrations ===