Updates to manage mypy errors

Author: chalmerlowe

samples/magics/conftest.py

@@ -18,7 +18,7 @@
 import pytest
 
 if typing.TYPE_CHECKING:
-    from IPython.core.interactiveshell import TerminalInteractiveShell
+    from IPython.terminal.interactiveshell import TerminalInteractiveShell
 
 interactiveshell = pytest.importorskip("IPython.terminal.interactiveshell")
 tools = pytest.importorskip("IPython.testing.tools")
@@ -40,5 +40,6 @@ def ipython_interactive(
 
     for the duration of the test scope.
     """
-    with ipython.builtin_trap:
-        yield ipython
+    if ipython.builtin_trap is not None:
+        with ipython.builtin_trap:
+            yield ipython

samples/notebooks/jupyter_tutorial_test.py

@@ -46,7 +46,7 @@ def ipython_interactive(
     for the duration of the test scope.
     """
 
-    if ipython.builtin_type is not None:
+    if ipython.builtin_trap is not None:
         with ipython.builtin_trap:
             yield ipython
 

samples/notebooks/noxfile.py

@@ -231,6 +231,7 @@ def _session_tests(
 
     session.run(
         "pytest",
+        "-s",
         *(PYTEST_COMMON_ARGS + session.posargs + concurrent_args),
         # Pytest will return 5 when no tests are collected. This can happen
         # on travis where slow and flaky tests are excluded.