Move importorskips in tests to __init__.py files (#2412)

Let's make the placement of the `importorskip`s consistent.

tests/integrations/aiohttp/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-aiohttp = pytest.importorskip("aiohttp")
+pytest.importorskip("aiohttp")

tests/integrations/ariadne/__init__.py

@@ -0,0 +1,5 @@
+import pytest
+
+pytest.importorskip("ariadne")
+pytest.importorskip("fastapi")
+pytest.importorskip("flask")

tests/integrations/ariadne/test_ariadne.py

@@ -1,9 +1,3 @@
-import pytest
-
-pytest.importorskip("ariadne")
-pytest.importorskip("fastapi")
-pytest.importorskip("flask")
-
 from ariadne import gql, graphql_sync, ObjectType, QueryType, make_executable_schema
 from ariadne.asgi import GraphQL
 from fastapi import FastAPI

tests/integrations/asgi/__init__.py

@@ -1,4 +1,5 @@
 import pytest
 
-asyncio = pytest.importorskip("asyncio")
-pytest_asyncio = pytest.importorskip("pytest_asyncio")
+pytest.importorskip("asyncio")
+pytest.importorskip("pytest_asyncio")
+pytest.importorskip("async_asgi_testclient")

tests/integrations/asgi/test_asgi.py

@@ -8,7 +8,6 @@
 from sentry_sdk.integrations._asgi_common import _get_ip, _get_headers
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware, _looks_like_asgi3
 
-async_asgi_testclient = pytest.importorskip("async_asgi_testclient")
 from async_asgi_testclient import TestClient
 
 

tests/integrations/asyncpg/__init__.py

@@ -1,3 +1,4 @@
 import pytest
 
 pytest.importorskip("asyncpg")
+pytest.importorskip("pytest_asyncio")

tests/integrations/asyncpg/test_asyncpg.py

@@ -22,11 +22,13 @@
 
 import asyncpg
 import pytest
+
+import pytest_asyncio
+
 from asyncpg import connect, Connection
 
 from sentry_sdk import capture_message
 from sentry_sdk.integrations.asyncpg import AsyncPGIntegration
-from tests.integrations.asgi import pytest_asyncio
 
 
 PG_CONNECTION_URI = f"postgresql://{PG_USER}:{PG_PASSWORD}@{PG_HOST}/{PG_NAME}"

tests/integrations/aws_lambda/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("boto3")

tests/integrations/aws_lambda/test_aws.py

@@ -22,7 +22,6 @@
 
 import pytest
 
-boto3 = pytest.importorskip("boto3")
 
 LAMBDA_PRELUDE = """
 from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration, get_lambda_bootstrap

tests/integrations/beam/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("apache_beam")

tests/integrations/beam/test_beam.py

@@ -1,8 +1,6 @@
 import pytest
 import inspect
 
-pytest.importorskip("apache_beam")
-
 import dill
 
 from sentry_sdk.integrations.beam import (

tests/integrations/bottle/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("bottle")

tests/integrations/bottle/test_bottle.py

@@ -2,9 +2,6 @@
 import pytest
 import logging
 
-
-pytest.importorskip("bottle")
-
 from io import BytesIO
 from bottle import Bottle, debug as set_debug, abort, redirect
 from sentry_sdk import capture_message

tests/integrations/celery/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("celery")

tests/integrations/celery/test_celery.py

@@ -2,8 +2,6 @@
 
 import pytest
 
-pytest.importorskip("celery")
-
 from sentry_sdk import Hub, configure_scope, start_transaction, get_current_span
 from sentry_sdk.integrations.celery import CeleryIntegration, _get_headers
 

tests/integrations/celery/test_celery_beat_crons.py

@@ -1,7 +1,5 @@
 import pytest
 
-pytest.importorskip("celery")
-
 from sentry_sdk.integrations.celery import (
     _get_headers,
     _get_humanized_interval,

tests/integrations/django/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-django = pytest.importorskip("django")
+pytest.importorskip("django")

tests/integrations/falcon/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("falcon")

tests/integrations/falcon/test_falcon.py

@@ -4,8 +4,6 @@
 
 import pytest
 
-pytest.importorskip("falcon")
-
 import falcon
 import falcon.testing
 import sentry_sdk

tests/integrations/fastapi/test_fastapi.py

@@ -5,8 +5,6 @@
 import pytest
 from sentry_sdk.integrations.fastapi import FastApiIntegration
 
-fastapi = pytest.importorskip("fastapi")
-
 from fastapi import FastAPI, Request
 from fastapi.testclient import TestClient
 from fastapi.middleware.trustedhost import TrustedHostMiddleware

tests/integrations/flask/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("flask")

tests/integrations/flask/test_flask.py

@@ -5,8 +5,6 @@
 
 from io import BytesIO
 
-flask = pytest.importorskip("flask")
-
 from flask import (
     Flask,
     Response,

tests/integrations/gql/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("gql")

tests/integrations/gql/test_gql.py

@@ -1,7 +1,5 @@
 import pytest
 
-pytest.importorskip("gql")
-
 import responses
 from gql import gql
 from gql import Client

tests/integrations/graphene/__init__.py

@@ -0,0 +1,5 @@
+import pytest
+
+pytest.importorskip("graphene")
+pytest.importorskip("fastapi")
+pytest.importorskip("flask")

tests/integrations/graphene/test_graphene_py3.py

@@ -1,9 +1,3 @@
-import pytest
-
-pytest.importorskip("graphene")
-pytest.importorskip("fastapi")
-pytest.importorskip("flask")
-
 from fastapi import FastAPI, Request
 from fastapi.testclient import TestClient
 from flask import Flask, request, jsonify

tests/integrations/opentelemetry/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-django = pytest.importorskip("opentelemetry")
+pytest.importorskip("opentelemetry")

tests/integrations/pure_eval/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-pure_eval = pytest.importorskip("pure_eval")
+pytest.importorskip("pure_eval")

tests/integrations/pyramid/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-pyramid = pytest.importorskip("pyramid")
+pytest.importorskip("pyramid")

tests/integrations/quart/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-quart = pytest.importorskip("quart")
+pytest.importorskip("quart")

tests/integrations/quart/test_quart.py

@@ -14,8 +14,6 @@
 from sentry_sdk.integrations.logging import LoggingIntegration
 import sentry_sdk.integrations.quart as quart_sentry
 
-quart = pytest.importorskip("quart")
-
 from quart import Quart, Response, abort, stream_with_context
 from quart.views import View
 

tests/integrations/requests/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("requests")

tests/integrations/requests/test_requests.py

@@ -1,7 +1,7 @@
-import pytest
+import requests
 import responses
 
-requests = pytest.importorskip("requests")
+import pytest
 
 from sentry_sdk import capture_message
 from sentry_sdk.consts import SPANDATA

tests/integrations/rq/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-rq = pytest.importorskip("rq")
+pytest.importorskip("rq")

tests/integrations/sanic/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-sanic = pytest.importorskip("sanic")
+pytest.importorskip("sanic")

tests/integrations/spark/__init__.py

@@ -0,0 +1,4 @@
+import pytest
+
+pytest.importorskip("pyspark")
+pytest.importorskip("py4j")

tests/integrations/spark/test_spark.py

@@ -8,10 +8,6 @@
 
 from sentry_sdk.integrations.spark.spark_worker import SparkWorkerIntegration
 
-
-pytest.importorskip("pyspark")
-pytest.importorskip("py4j")
-
 from pyspark import SparkContext
 
 from py4j.protocol import Py4JJavaError

tests/integrations/starlette/test_starlette.py

@@ -24,7 +24,7 @@
     StarletteRequestExtractor,
 )
 
-starlette = pytest.importorskip("starlette")
+import starlette
 from starlette.authentication import (
     AuthCredentials,
     AuthenticationBackend,

tests/integrations/starlite/test_starlite.py

@@ -5,10 +5,9 @@
 from sentry_sdk import capture_exception, capture_message, last_event_id
 from sentry_sdk.integrations.starlite import StarliteIntegration
 
-starlite = pytest.importorskip("starlite")
-
 from typing import Any, Dict
 
+import starlite
 from starlite import AbstractMiddleware, LoggingConfig, Starlite, get, Controller
 from starlite.middleware import LoggingMiddlewareConfig, RateLimitConfig
 from starlite.middleware.session.memory_backend import MemoryBackendConfig

tests/integrations/tornado/__init__.py

@@ -1,3 +1,3 @@
 import pytest
 
-tornado = pytest.importorskip("tornado")
+pytest.importorskip("tornado")

tests/integrations/trytond/__init__.py

@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("trytond")

tests/integrations/trytond/test_trytond.py

@@ -1,10 +1,8 @@
-import pytest
-
-pytest.importorskip("trytond")
-
 import json
 import unittest.mock
 
+import pytest
+
 import trytond
 from trytond.exceptions import TrytonException as TrytondBaseException
 from trytond.exceptions import UserError as TrytondUserError