Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Use jupyter_nbextensions_configurator's actual install app #769

Merged
merged 3 commits into from
Oct 18, 2016
Merged

Use jupyter_nbextensions_configurator's actual install app #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c67c8d
Use jupyter_nbextensions_configurator's actuall install process
jcb91 Oct 18, 2016
2410641
fix configurator import
jcb91 Oct 18, 2016
9bc9ec8
allow configurator config values to remain on uninstall
jcb91 Oct 18, 2016
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
13 changes: 8 additions & 5 deletions src/jupyter_contrib_nbextensions/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
import os

import psutil
from jupyter_contrib_core.notebook_compat import nbextensions, serverextensions
from jupyter_contrib_core.notebook_compat import nbextensions
from jupyter_nbextensions_configurator.application import (
EnableJupyterNbextensionsConfiguratorApp,
)
from traitlets.config import Config
from traitlets.config.manager import BaseJSONConfigManager

Expand Down Expand Up @@ -64,9 +67,9 @@ def toggle_install(install, user=False, sys_prefix=False, overwrite=False,

# Configure the jupyter_nbextensions_configurator serverextension to load
if install:
serverextensions.toggle_serverextension_python(
'jupyter_nbextensions_configurator',
enabled=True, user=user, sys_prefix=sys_prefix, logger=logger)
conf_app = EnableJupyterNbextensionsConfiguratorApp(
user=user, sys_prefix=sys_prefix, symlink=symlink, logger=logger)
conf_app.start()

# nbextensions:
kwargs = dict(user=user, sys_prefix=sys_prefix, prefix=prefix,
Expand All @@ -77,7 +80,7 @@ def toggle_install(install, user=False, sys_prefix=False, overwrite=False,
overwrite=overwrite, symlink=symlink, **kwargs)
# enable contrib_nbextensions_help_item (item in help menu)
nbextensions.enable_nbextension('notebook',
'contrib_nbextensions_help_item/main',
'contrib_nbextensions_help_item/main',
user=user, sys_prefix=sys_prefix)
else:
nbextensions.uninstall_nbextension_python(
Expand Down
6 changes: 6 additions & 0 deletions tests/test_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,14 @@ def _check_uninstall(self, dirs, installed_files):
conf = Config(json.load(f))
confstrip = {}
confstrip.update(conf)
# strip out config values we are ok to have remain
confstrip.pop('NotebookApp', None)
confstrip.pop('version', None)
conf_exts = confstrip.get('load_extensions', {})
conf_exts.pop('nbextensions_configurator/config_menu/main', None)
conf_exts.pop('nbextensions_configurator/tree_tab/main', None)
if not conf_exts:
confstrip.pop('load_extensions', None)
nt.assert_false(confstrip, 'disable should leave config empty.')

def _get_default_check_kwargs(self, argv=None, dirs=None):
Expand Down