Add server extension file, move to jupyter-config/

Author: jtpio

.github/workflows/build.yml

@@ -34,6 +34,7 @@ jobs:
     - name: Check the server, classic and lab extensions are installed
       run: |
         jupyter serverextension list 2>&1 | grep -ie "jupyter_resource_usage.*enabled"
+        jupyter server extension list 2>&1 | grep -ie "jupyter_resource_usage.*enabled"
         jupyter nbextension list 2>&1 | grep -ie "jupyter_resource_usage/main.*enabled"
         jupyter labextension list 2>&1 | grep -ie "@jupyter-server/resource-usage.*OK"
         python -m jupyterlab.browser_check

MANIFEST.in

@@ -6,7 +6,8 @@ include package.json
 include install.json
 include ts*.json
 
-graft jupyter_resource_usage/etc
+recursive-include jupyter-config *.json
+
 graft jupyter_resource_usage/labextension
 graft jupyter_resource_usage/static
 

jupyter_resource_usage/etc/serverextension.json renamed to jupyter-config/jupyter_notebook_config.d/jupyter_resource_usage.json

@@ -0,0 +1,7 @@
+{
+  "ServerApp": {
+    "jpserver_extensions": {
+      "jupyter_resource_usage": true
+    }
+  }
+}

jupyter-config/jupyter_server_config.d/jupyter_resource_usage.json

@@ -17,6 +17,7 @@
 
 src_path = os.path.join(HERE, "packages", "labextension")
 lab_path = os.path.join(HERE, PACKAGE_NAME, "labextension")
+nb_path = os.path.join(HERE, PACKAGE_NAME, "static")
 
 # Representative files that should exist after a successful build
 jstargets = [
@@ -27,10 +28,27 @@
 package_data_spec = {PACKAGE_NAME: ["*"]}
 
 labext_name = "@jupyter-server/resource-usage"
+nbext_name = "jupyter_resource_usage"
 
 data_files_spec = [
+    ("share/jupyter/nbextensions/%s" % nbext_name, nb_path, "**"),
     ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"),
     ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),
+    (
+        "etc/jupyter/jupyter_server_config.d",
+        "jupyter-config/jupyter_server_config.d",
+        "jupyter_resource_usage.json",
+    ),
+    (
+        "etc/jupyter/jupyter_notebook_config.d",
+        "jupyter-config/jupyter_notebook_config.d",
+        "jupyter_resource_usage.json",
+    ),
+    (
+        "etc/jupyter/nbconfig/notebook.d",
+        "jupyter-config/nbconfig/notebook.d",
+        "jupyter_resource_usage.json",
+    ),
 ]
 
 cmdclass = create_cmdclass(
@@ -59,20 +77,6 @@
     extras_require={
         "dev": ["autopep8", "black", "pytest", "flake8", "pytest-cov>=2.6.1", "mock"]
     },
-    data_files=[
-        (
-            "share/jupyter/nbextensions/jupyter-resource-usage",
-            glob("jupyter_resource_usage/static/*"),
-        ),
-        (
-            "etc/jupyter/jupyter_notebook_config.d",
-            ["jupyter_resource_usage/etc/serverextension.json"],
-        ),
-        (
-            "etc/jupyter/nbconfig/notebook.d",
-            ["jupyter_resource_usage/etc/nbextension.json"],
-        ),
-    ],
     zip_safe=False,
     include_package_data=True,
     license="BSD",