Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
echarles committed Feb 29, 2020
1 parent 060f29b commit 86b89ec
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
14 changes: 10 additions & 4 deletions jupyterlab/labapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,12 @@ class LabApp(ExtensionApp, ExtensionAppJinjaMixin):
# The config.
c = None

@staticmethod
def _jupyter_server_extension_paths():
return [{
'module': 'jupyterlab'
}]

def initialize_templates(self):
if self.c == None:
self.c = load_config(self)
Expand Down Expand Up @@ -554,10 +560,10 @@ def initialize_handlers(self):
self.c = load_config(self)
self.static_paths = [self.c.static_dir]
self.template_paths = [self.c.templates_dir]
if not self.serverapp.jpserver_extensions.get('jupyterlab', False):
msg = 'JupyterLab server extension not enabled, manually loading...'
self.log.warning(msg)
load_jupyter_server_extension(self)
# TODO(@echarles) Discuss with @Zsailer https://github.com/jupyter/jupyter_server/pull/180
# if not self.serverapp.jpserver_extensions.get('jupyterlab', False):
self.log.warning('JupyterLab server extension not enabled, manually loading...')
load_jupyter_server_extension(self)

#-----------------------------------------------------------------------------
# Main entry point
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def run(self):
'jinja2>=2.10',
'nbclassic@ git+https://github.com/datalayer-contrib/jupyter-notebook-classic@jupyterlab',
'jupyterlab_server@ git+https://github.com/datalayer-contrib/jupyterlab-server@jupyter_server',
'jupyter_server@ git+https://github.com/datalayer-contrib/jupyter-server.git@extension_handlers',
'jupyter_server@ git+https://github.com/datalayer-contrib/jupyter-server.git@discover-extensionapp-config',
]

setup_args['extras_require'] = {
Expand Down

0 comments on commit 86b89ec

Please sign in to comment.