Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ipykernel/inprocess/tests/test_kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
from ipykernel.inprocess.manager import InProcessKernelManager
from ipykernel.inprocess.ipkernel import InProcessKernel
from ipykernel.tests.utils import assemble_output
from IPython.testing.decorators import skipif_not_matplotlib
from IPython.utils.io import capture_output



def _init_asyncio_patch():
"""set default asyncio policy to be compatible with tornado

Expand Down Expand Up @@ -60,9 +60,9 @@ def setUp(self):
self.kc.start_channels()
self.kc.wait_for_ready()

@skipif_not_matplotlib
def test_pylab(self):
"""Does %pylab work in the in-process kernel?"""
matplotlib = pytest.importorskip('matplotlib', reason='This test requires matplotlib')
kc = self.kc
kc.execute('%pylab')
out, err = assemble_output(kc.get_iopub_msg)
Expand Down
6 changes: 3 additions & 3 deletions ipykernel/tests/test_kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import pytest
from packaging import version

from IPython.testing import decorators as dec, tools as tt
from IPython.testing import tools as tt
import IPython
from IPython.paths import locate_profile

Expand Down Expand Up @@ -225,8 +225,8 @@ def test_save_history():
assert 'b="abcþ"' in content


@dec.skip_without('faulthandler')
def test_smoke_faulthandler():
faulthadler = pytest.importorskip('faulthandler', reason='this test needs faulthandler')
with kernel() as kc:
# Note: faulthandler.register is not available on windows.
code = '\n'.join([
Expand Down Expand Up @@ -296,8 +296,8 @@ def test_complete():
assert completed.startswith(cell)


@dec.skip_without('matplotlib')
def test_matplotlib_inline_on_import():
pytest.importorskip('matplotlib', reason='this test requires matplotlib')
with kernel() as kc:
cell = '\n'.join([
'import matplotlib, matplotlib.pyplot as plt',
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def run(self):
'importlib-metadata<5;python_version<"3.8.0"',
'argcomplete>=1.12.3;python_version<"3.8.0"',
'debugpy>=1.0.0,<2.0',
'ipython>=7.23.1,<8.0',
'ipython>=7.23.1',
'traitlets>=5.1.0,<6.0',
'jupyter_client<8.0',
'tornado>=4.2,<7.0',
Expand Down