fix: Fix circular import in apidocs

untitaker · untitaker · commit 71b9e1faa3f5 · 2019-08-13T18:16:28.000+02:00
diff --git a/Makefile b/Makefile
@@ -48,24 +48,19 @@ lint: .venv
 
 .PHONY: lint
 
-apidocs-sphinx: .venv
-	@$(VENV_PATH)/bin/pip install --editable .
-	@$(VENV_PATH)/bin/pip install -U -r ./docs-requirements.txt
-	@$(VENV_PATH)/bin/sphinx-build -b html docs/ docs/_build
-.PHONY: apidocs-sphinx
-
 apidocs: .venv
 	@$(VENV_PATH)/bin/pip install --editable .
-	@$(VENV_PATH)/bin/pip install pdoc==0.3.2 pygments
-	@$(VENV_PATH)/bin/pdoc --overwrite --html --html-dir build/apidocs sentry_sdk
+	@$(VENV_PATH)/bin/pip install -U -r ./docs-requirements.txt
+	@$(VENV_PATH)/bin/sphinx-build -W -b html docs/ docs/_build
 .PHONY: apidocs
+
 install-zeus-cli:
 	npm install -g @zeus-ci/cli
 .PHONY: install-zeus-cli
 
 travis-upload-docs: apidocs install-zeus-cli
-	cd build/apidocs && zip -r gh-pages ./sentry_sdk
-	zeus upload -t "application/zip+docs" build/apidocs/gh-pages.zip \
+	cd docs/_build && zip -r gh-pages ./sentry_sdk
+	zeus upload -t "application/zip+docs" docs/_build/gh-pages.zip \
 		|| [[ ! "$(TRAVIS_BRANCH)" =~ ^release/ ]]
 .PHONY: travis-upload-docs
 
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -22,7 +22,7 @@
     from typing import Dict
     from typing import List
 
-    from sentry_sdk import Hub
+    import sentry_sdk
 
 _traceparent_header_format_re = re.compile(
     "^[ \t]*"  # whitespace
@@ -249,7 +249,7 @@ def _format_sql(cursor, sql):
 
 @contextlib.contextmanager
 def record_sql_queries(
-    hub,  # type: Hub
+    hub,  # type: sentry_sdk.Hub
     cursor,  # type: Any
     query,  # type: Any
     params_list,  # type:  Any
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
@@ -576,4 +576,4 @@ def dispatch_request(self):
     event, = events
 
     assert event["message"] == "hi"
-    assert event['transaction'] == 'hello_class'
+    assert event["transaction"] == "hello_class"
