diff --git a/requirements-testing.txt b/requirements-testing.txt index f704e8165b..ac19d7696a 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -1,5 +1,4 @@ pytest>=6.0.0 pytest-cov dataclasses; python_version < "3.7" -executing setuptools diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py index fdca66d38d..ebe4dcffbe 100644 --- a/scripts/populate_tox/config.py +++ b/scripts/populate_tox/config.py @@ -110,6 +110,7 @@ "pytest-forked", "Werkzeug", "channels[daphne]", + "executing", ], ">=3.0": ["pytest-asyncio"], "<3.3": [ @@ -343,7 +344,7 @@ "pure_eval": { "package": "pure_eval", "deps": { - "*": ["asttokens"], + "*": ["asttokens", "executing"], }, "num_versions": 2, }, diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja index 27b1ce063b..c6b0530a79 100644 --- a/scripts/populate_tox/tox.jinja +++ b/scripts/populate_tox/tox.jinja @@ -80,6 +80,7 @@ deps = # === Common === py3.8-common: hypothesis common: brotli + common: executing common: httpcore[asyncio,http2] common: jsonschema common: pysocks @@ -106,6 +107,7 @@ deps = {py3.6,py3.7}-gevent: pytest<7.0.0 {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest gevent: brotli + gevent: executing gevent: httpcore[http2] gevent: jsonschema gevent: pysocks diff --git a/sentry_sdk/integrations/executing.py b/sentry_sdk/integrations/executing.py index cd31fcff96..4473fcc435 100644 --- a/sentry_sdk/integrations/executing.py +++ b/sentry_sdk/integrations/executing.py @@ -11,7 +11,7 @@ from sentry_sdk._types import Event, Hint try: - import executing + from executing import Source except ImportError: raise DidNotEnable("executing is not installed") @@ -60,7 +60,7 @@ def add_executing_info( for sentry_frame, tb in zip(sentry_frames, tbs): frame = tb.tb_frame - source = executing.Source.for_frame(frame) + source = Source.for_frame(frame) sentry_frame["function"] = source.code_qualname(frame.f_code) return event diff --git a/tox.ini b/tox.ini index 6e892d2141..6e20386840 100644 --- a/tox.ini +++ b/tox.ini @@ -401,6 +401,7 @@ deps = # === Common === py3.8-common: hypothesis common: brotli + common: executing common: httpcore[asyncio,http2] common: jsonschema common: pysocks @@ -427,6 +428,7 @@ deps = {py3.6,py3.7}-gevent: pytest<7.0.0 {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest gevent: brotli + gevent: executing gevent: httpcore[http2] gevent: jsonschema gevent: pysocks @@ -11306,6 +11308,7 @@ deps = django: pytest-forked django: Werkzeug django: channels[daphne] + django: executing django-v3.2.25: pytest-asyncio django-v4.2.30: pytest-asyncio django-v5.2.15: pytest-asyncio @@ -12963,6 +12966,7 @@ deps = pure_eval-latest: pure_eval==0.2.3 pure_eval: asttokens + pure_eval: executing trytond-v4.6.22: trytond==4.6.22