fix(apidocs): Fix circular imports, run in PRs and master (getsentry#1197)

untitaker · web-flow · commit a7807847811b · 2021-09-21T09:38:23.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,8 +37,6 @@ jobs:
     name: build documentation
     runs-on: ubuntu-latest
 
-    if: "startsWith(github.ref, 'refs/heads/release/')"
-
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit 3647b8cab1b3cfa289e8d7d995a5c9efee8c4b91
+Subproject commit f8615dff7f4640ff8a1810b264589b9fc6a4684a
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -7,16 +7,6 @@
 import sentry_sdk
 
 from sentry_sdk.utils import logger
-from sentry_sdk.tracing_utils import (
-    EnvironHeaders,
-    compute_tracestate_entry,
-    extract_sentrytrace_data,
-    extract_tracestate_data,
-    has_tracestate_enabled,
-    has_tracing_enabled,
-    is_valid_sample_rate,
-    maybe_create_breadcrumbs_from_span,
-)
 from sentry_sdk._types import MYPY
 
 
@@ -718,3 +708,17 @@ def _set_initial_sampling_decision(self, sampling_context):
                     sample_rate=float(sample_rate),
                 )
             )
+
+
+# Circular imports
+
+from sentry_sdk.tracing_utils import (
+    EnvironHeaders,
+    compute_tracestate_entry,
+    extract_sentrytrace_data,
+    extract_tracestate_data,
+    has_tracestate_enabled,
+    has_tracing_enabled,
+    is_valid_sample_rate,
+    maybe_create_breadcrumbs_from_span,
+)
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
@@ -32,8 +32,6 @@
     from typing import Dict
     from typing import Union
 
-    from sentry_sdk.tracing import Span
-
 
 SENTRY_TRACE_REGEX = re.compile(
     "^[ \t]*"  # whitespace
@@ -405,3 +403,9 @@ def has_tracestate_enabled(span=None):
     options = client and client.options
 
     return bool(options and options["_experiments"].get("propagate_tracestate"))
+
+
+# Circular imports
+
+if MYPY:
+    from sentry_sdk.tracing import Span
