Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add failing test and fix for old-style relative import. #109

Merged
merged 5 commits into from
May 11, 2018
Merged

Add failing test and fix for old-style relative import. #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4159678
Add failing test for old-style relative import.
mdickinson May 10, 2018
a0fe493
Merge remote-tracking branch 'origin/master' into 108-fix-old-style-r…
mdickinson May 11, 2018
6843b9d
Merge from master; fix conflicts.
mdickinson May 11, 2018
35febb3
Remove an unused import and a duplicate import.
mdickinson May 11, 2018
b2a75bc
Now fix that failing test!
mdickinson May 11, 2018
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
2 changes: 1 addition & 1 deletion envisage/plugins/ipython_kernel/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from ipython_kernel_plugin import IPythonKernelPlugin, IPYTHON_KERNEL_PROTOCOL # noqa
from .ipython_kernel_plugin import IPythonKernelPlugin, IPYTHON_KERNEL_PROTOCOL # noqa
7 changes: 6 additions & 1 deletion envisage/plugins/ipython_kernel/tests/test_ipython_kernel_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from traits.api import List

from envisage._compat import STRING_BASE_CLASS
from envisage.api import Application, Plugin
from envisage.core_plugin import CorePlugin

Expand All @@ -13,7 +14,6 @@
else:
ipykernel_available = True


if ipykernel_available:
from ipykernel.kernelapp import IPKernelApp

Expand All @@ -30,6 +30,11 @@ class TestIPythonKernelPlugin(unittest.TestCase):
def tearDown(self):
IPKernelApp.clear_instance()

def test_import_from_api(self):
# Regression test for enthought/envisage#108
from envisage.plugins.ipython_kernel.api import IPYTHON_KERNEL_PROTOCOL
self.assertIsInstance(IPYTHON_KERNEL_PROTOCOL, STRING_BASE_CLASS)

def test_kernel_service(self):
# See that we can get the IPython kernel service when the plugin is
# there.
Expand Down