Skip to content

Commit 86b89ec

Browse files
committed
1 parent 060f29b commit 86b89ec

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

jupyterlab/labapp.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,12 @@ class LabApp(ExtensionApp, ExtensionAppJinjaMixin):
506506
# The config.
507507
c = None
508508

509+
@staticmethod
510+
def _jupyter_server_extension_paths():
511+
return [{
512+
'module': 'jupyterlab'
513+
}]
514+
509515
def initialize_templates(self):
510516
if self.c == None:
511517
self.c = load_config(self)
@@ -554,10 +560,10 @@ def initialize_handlers(self):
554560
self.c = load_config(self)
555561
self.static_paths = [self.c.static_dir]
556562
self.template_paths = [self.c.templates_dir]
557-
if not self.serverapp.jpserver_extensions.get('jupyterlab', False):
558-
msg = 'JupyterLab server extension not enabled, manually loading...'
559-
self.log.warning(msg)
560-
load_jupyter_server_extension(self)
563+
# TODO(@echarles) Discuss with @Zsailer https://github.com/jupyter/jupyter_server/pull/180
564+
# if not self.serverapp.jpserver_extensions.get('jupyterlab', False):
565+
self.log.warning('JupyterLab server extension not enabled, manually loading...')
566+
load_jupyter_server_extension(self)
561567

562568
#-----------------------------------------------------------------------------
563569
# Main entry point

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def run(self):
143143
'jinja2>=2.10',
144144
'nbclassic@ git+https://github.com/datalayer-contrib/jupyter-notebook-classic@jupyterlab',
145145
'jupyterlab_server@ git+https://github.com/datalayer-contrib/jupyterlab-server@jupyter_server',
146-
'jupyter_server@ git+https://github.com/datalayer-contrib/jupyter-server.git@extension_handlers',
146+
'jupyter_server@ git+https://github.com/datalayer-contrib/jupyter-server.git@discover-extensionapp-config',
147147
]
148148

149149
setup_args['extras_require'] = {

0 commit comments

Comments
 (0)