chore: Bump mypy and fix abstract ContextManager typing (#1421)

Author: sl0thentr0py

linter-requirements.txt

@@ -1,7 +1,10 @@
 black==22.3.0
 flake8==3.9.2
 flake8-import-order==0.18.1
-mypy==0.782
+mypy==0.950
+types-certifi
+types-redis
+types-setuptools
 flake8-bugbear==21.4.3
 pep8-naming==0.11.1
-pre-commit # local linting
+pre-commit # local linting

mypy.ini

@@ -61,3 +61,5 @@ ignore_missing_imports = True
 disallow_untyped_defs = False
 [mypy-celery.app.trace]
 ignore_missing_imports = True
+[mypy-flask.signals]
+ignore_missing_imports = True

sentry_sdk/hub.py

@@ -117,7 +117,7 @@ def _init(*args, **kwargs):
     # Use `ClientConstructor` to define the argument types of `init` and
     # `ContextManager[Any]` to tell static analyzers about the return type.
 
-    class init(ClientConstructor, ContextManager[Any]):  # noqa: N801
+    class init(ClientConstructor, _InitGuard):  # noqa: N801
         pass
 
 else:

sentry_sdk/integrations/aws_lambda.py

@@ -302,12 +302,12 @@ def get_lambda_bootstrap():
         module = sys.modules["__main__"]
         # python3.9 runtime
         if hasattr(module, "awslambdaricmain") and hasattr(
-            module.awslambdaricmain, "bootstrap"  # type: ignore
+            module.awslambdaricmain, "bootstrap"
         ):
-            return module.awslambdaricmain.bootstrap  # type: ignore
+            return module.awslambdaricmain.bootstrap
         elif hasattr(module, "bootstrap"):
             # awslambdaric python module in container builds
-            return module.bootstrap  # type: ignore
+            return module.bootstrap
 
         # python3.8 runtime
         return module

sentry_sdk/integrations/celery.py

@@ -23,7 +23,7 @@
 
 
 try:
-    from celery import VERSION as CELERY_VERSION  # type: ignore
+    from celery import VERSION as CELERY_VERSION
     from celery.exceptions import (  # type: ignore
         SoftTimeLimitExceeded,
         Retry,

sentry_sdk/integrations/excepthook.py

@@ -10,11 +10,12 @@
     from typing import Callable
     from typing import Any
     from typing import Type
+    from typing import Optional
 
     from types import TracebackType
 
     Excepthook = Callable[
-        [Type[BaseException], BaseException, TracebackType],
+        [Type[BaseException], BaseException, Optional[TracebackType]],
         Any,
     ]
 
@@ -43,7 +44,7 @@ def setup_once():
 def _make_excepthook(old_excepthook):
     # type: (Excepthook) -> Excepthook
     def sentry_sdk_excepthook(type_, value, traceback):
-        # type: (Type[BaseException], BaseException, TracebackType) -> None
+        # type: (Type[BaseException], BaseException, Optional[TracebackType]) -> None
         hub = Hub.current
         integration = hub.get_integration(ExcepthookIntegration)
 

sentry_sdk/integrations/flask.py

@@ -94,7 +94,7 @@ def sentry_patched_wsgi_app(self, environ, start_response):
                 environ, start_response
             )
 
-        Flask.__call__ = sentry_patched_wsgi_app  # type: ignore
+        Flask.__call__ = sentry_patched_wsgi_app
 
 
 def _add_sentry_trace(sender, template, context, **extra):

sentry_sdk/integrations/gcp.py

@@ -126,7 +126,7 @@ def __init__(self, timeout_warning=False):
     @staticmethod
     def setup_once():
         # type: () -> None
-        import __main__ as gcp_functions  # type: ignore
+        import __main__ as gcp_functions
 
         if not hasattr(gcp_functions, "worker_v1"):
             logger.warning(

sentry_sdk/integrations/logging.py

@@ -78,7 +78,7 @@ def _handle_record(self, record):
     @staticmethod
     def setup_once():
         # type: () -> None
-        old_callhandlers = logging.Logger.callHandlers  # type: ignore
+        old_callhandlers = logging.Logger.callHandlers
 
         def sentry_patched_callhandlers(self, record):
             # type: (Any, LogRecord) -> Any

sentry_sdk/integrations/sqlalchemy.py

@@ -70,7 +70,7 @@ def _after_cursor_execute(conn, cursor, statement, parameters, context, *args):
     # type: (Any, Any, Any, Any, Any, *Any) -> None
     ctx_mgr = getattr(
         context, "_sentry_sql_span_manager", None
-    )  # type: ContextManager[Any]
+    )  # type: Optional[ContextManager[Any]]
 
     if ctx_mgr is not None:
         context._sentry_sql_span_manager = None
@@ -93,7 +93,7 @@ def _handle_error(context, *args):
     # handler is going to be fatal.
     ctx_mgr = getattr(
         execution_context, "_sentry_sql_span_manager", None
-    )  # type: ContextManager[Any]
+    )  # type: Optional[ContextManager[Any]]
 
     if ctx_mgr is not None:
         execution_context._sentry_sql_span_manager = None