Skip to content

Commit

Permalink
Merge pull request #265 from Zsailer/enable-bug
Browse files Browse the repository at this point in the history
enable new extensions
  • Loading branch information
blink1073 authored Aug 4, 2020
2 parents a593007 + 18806bb commit 8822fef
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
4 changes: 4 additions & 0 deletions jupyter_server/extension/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ def __init__(self, config_manager=None, *args, **kwargs):
if self._config_manager:
self.from_config_manager(self._config_manager)

@property
def config_manager(self):
return self._config_manager

@property
def extensions(self):
"""Dictionary with extension package names as keys
Expand Down
15 changes: 8 additions & 7 deletions jupyter_server/extension/serverextension.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
)
from jupyter_server._version import __version__
from jupyter_server.extension.config import ExtensionConfigManager
from jupyter_server.extension.manager import ExtensionManager
from jupyter_server.extension.manager import ExtensionManager, ExtensionPackage


def _get_config_dir(user=False, sys_prefix=False):
Expand Down Expand Up @@ -216,22 +216,23 @@ def toggle_server_extension(self, import_name):
`load_jupyter_server_extension` function
"""
# Create an extension manager for this instance.
ext_manager, extension_manager = _get_extmanager_for_context(
config_dir, extension_manager = _get_extmanager_for_context(
user=self.user,
sys_prefix=self.sys_prefix
)
try:
self.log.info("{}: {}".format(self._toggle_pre_message.capitalize(), import_name))
self.log.info("- Writing config: {}".format(ext_manager))
self.log.info("- Writing config: {}".format(config_dir))
# Validate the server extension.
self.log.info(" - Validating {}...".format(import_name))
extension = extension_manager.extensions[import_name]
extension.validate()
version = extension.version
# Interface with the Extension Package and validate.
extpkg = ExtensionPackage(name=import_name)
extpkg.validate()
version = extpkg.version
self.log.info(" {} {} {}".format(import_name, version, GREEN_OK))

# Toggle extension config.
config = self.config_manager
config = extension_manager.config_manager
if self._toggle_value is True:
config.enable(import_name)
else:
Expand Down

0 comments on commit 8822fef

Please sign in to comment.