Enable extensions as both Notebook/Jupyter Server extensions (#1476)

Fixes #1474

elyra/__init__.py

@@ -51,3 +51,5 @@ def _load_jupyter_server_extension(nb_server_app):
     # Create PipelineProcessorManager instance passing root directory
     PipelineProcessorManager.instance(root_dir=web_app.settings['server_root_dir'], parent=nb_server_app)
 
+# For backward compatibility
+load_jupyter_server_extension = _load_jupyter_server_extension

etc/config/jupyter_notebook_config.d/elyra.json

@@ -0,0 +1,7 @@
+{
+  "NotebookApp": {
+    "nbserver_extensions": {
+      "elyra": true
+    }
+  }
+}

etc/config/jupyter_notebook_config.d/jupyter_resource_usage.json

@@ -0,0 +1,7 @@
+{
+  "NotebookApp": {
+    "nbserver_extensions": {
+      "jupyter_resource_usage": true
+    }
+  }
+}

etc/config/jupyter_notebook_config.d/jupyterlab_git.json

@@ -0,0 +1,7 @@
+{
+  "NotebookApp": {
+    "nbserver_extensions": {
+      "jupyterlab_git": true
+    }
+  }
+}

setup.py

@@ -31,7 +31,8 @@
     exec(f.read(), {}, version_ns)
 
 npm_packages_path = "./dist/*.tgz"
-auto_extension_path = "./etc/config/jupyter_server_config.d/*.json"
+auto_jupyter_notebook_extension_path = "./etc/config/jupyter_notebook_config.d/*.json"
+auto_jupyter_server_extension_path = "./etc/config/jupyter_server_config.d/*.json"
 settings_path = './etc/config/settings/*.json'
 metadata_path = './etc/config/metadata/runtime-images/*.json'
 
@@ -54,7 +55,8 @@
     long_description=long_desc,
     author="Elyra Maintainers",
     license="Apache License Version 2.0",
-    data_files=[('etc/jupyter/jupyter_server_config.d', glob(auto_extension_path)),
+    data_files=[('etc/jupyter/jupyter_notebook_config.d', glob(auto_jupyter_notebook_extension_path)),
+                ('etc/jupyter/jupyter_server_config.d', glob(auto_jupyter_server_extension_path)),
                 ('share/jupyter/lab/settings', glob(settings_path)),
                 ('share/jupyter/metadata/runtime-images', glob(metadata_path))],
     packages=find_packages(),
@@ -67,7 +69,7 @@
         'jupyter_client>=6.1.7',
         'jupyter_server>=1.2.0',
         'jupyterlab>=3.0.0',
-        'jupyterlab-git==0.30.0b1',
+        'jupyterlab-git==0.30.0b2',
         'jupyterlab-lsp>=3.0.0',
         'jupyter-resource-usage>=0.5.1',
         'minio>=5.0.7,<7.0.0',