diff --git a/IPython/core/tests/daft_extension.py b/IPython/core/tests/daft_extension/daft_extension.py similarity index 100% rename from IPython/core/tests/daft_extension.py rename to IPython/core/tests/daft_extension/daft_extension.py diff --git a/IPython/core/tests/daft_extension/setup.py b/IPython/core/tests/daft_extension/setup.py new file mode 100644 index 0000000..ed00d79 --- /dev/null +++ b/IPython/core/tests/daft_extension/setup.py @@ -0,0 +1,5 @@ +from distutils.core import setup +setup(name='daft_extension', + version='1.0', + py_modules=['daft_extension'], + ) diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py index 9bbe3c3..c4d15e9 100644 --- a/IPython/core/tests/test_magic.py +++ b/IPython/core/tests/test_magic.py @@ -9,7 +9,7 @@ import io import os import sys import warnings -from unittest import TestCase, skipIf +from unittest import TestCase try: from importlib import invalidate_caches # Required from Python 3.3 @@ -23,9 +23,8 @@ from IPython import get_ipython from IPython.core import magic from IPython.core.error import UsageError from IPython.core.magic import (Magics, magics_class, line_magic, - cell_magic, line_cell_magic, - register_line_magic, register_cell_magic, - register_line_cell_magic) + cell_magic, + register_line_magic, register_cell_magic) from IPython.core.magics import execution, script, code from IPython.testing import decorators as dec from IPython.testing import tools as tt @@ -611,8 +610,8 @@ def test_extension(): try: _ip.ipython_dir = tmpdir.name nt.assert_raises(ImportError, _ip.magic, "load_ext daft_extension") - url = os.path.join(os.path.dirname(__file__), "daft_extension.py") - _ip.magic("install_ext %s" % url) + url = os.path.join(os.path.dirname(__file__), "daft_extension") + _ip.system("%s -m pip install %s" % (sys.executable, url)) _ip.user_ns.pop('arq', None) invalidate_caches() # Clear import caches _ip.magic("load_ext daft_extension")