Merge pull request jupyterlab#133 from jtpio/rc7

Update to the latest rc
mateusz-garlacz · Nov 6, 2020 · 6b7dbd3 · 6b7dbd3
2 parents bd34397 + 00bab63
commit 6b7dbd3
Show file tree

Hide file tree

Showing 91 changed files with 468 additions and 311 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ node_modules/
 **/node_modules/**/README.md
 
 static
+labextension
diff --git a/.prettierignore b/.prettierignore
@@ -2,4 +2,4 @@ node_modules
 **/node_modules
 **/lib
 **/package.json
-**/static
+**/labextension
diff --git a/advanced/kernel-messaging/MANIFEST.in b/advanced/kernel-messaging/MANIFEST.in
@@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_kernel_messaging.json
 include package.json
 include ts*.json
 
-graft jupyterlab_examples_kernel_messaging/static
+graft jupyterlab_examples_kernel_messaging/labextension
 
 # Javascript files
 graft src

diff --git a/advanced/kernel-messaging/install.json b/advanced/kernel-messaging/install.json
@@ -0,0 +1,5 @@
+{
+  "packageManager": "python",
+  "packageName": "jupyterlab_examples_kernel_messaging",
+  "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_kernel_messaging"
+}
diff --git a/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py b/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py
@@ -6,12 +6,12 @@
 
 HERE = osp.abspath(osp.dirname(__file__))
 
-with open(osp.join(HERE, 'static', 'package.json')) as fid:
+with open(osp.join(HERE, 'labextension', 'package.json')) as fid:
     data = json.load(fid)
 
 def _jupyter_labextension_paths():
     return [{
-        'src': 'static',
+        'src': 'labextension',
         'dest': data['name']
     }]
 

diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json
@@ -25,37 +25,38 @@
     "url": "https://github.com/jupyterlab/extension-examples.git"
   },
   "scripts": {
-    "build": "jlpm run build:lib && jlpm run build:labextension",
+    "build": "jlpm run build:lib && jlpm run build:labextension:dev",
     "build:all": "jlpm run build:lib && jlpm run build:labextension",
     "build:labextension": "jupyter labextension build .",
     "build:labextension:dev": "jupyter labextension build --development True .",
     "build:lib": "tsc",
+    "build:prod": "jlpm run build:lib && jlpm run build:labextension",
     "clean": "jlpm run clean:lib",
     "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
-    "clean:labextension": "rimraf jupyterlab_examples_kernel_messaging/static",
+    "clean:labextension": "rimraf jupyterlab_examples_kernel_messaging/labextension",
     "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
     "eslint": "eslint . --ext .ts,.tsx --fix",
     "eslint:check": "eslint . --ext .ts,.tsx",
     "install:extension": "jupyter labextension develop --overwrite .",
-    "prepare": "jlpm run clean && jlpm run build",
+    "prepare": "jlpm run clean && jlpm run build:prod",
     "watch": "run-p watch:src watch:labextension",
     "watch:labextension": "jupyter labextension watch .",
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.0.0-rc.2",
-    "@jupyterlab/launcher": "^3.0.0-rc.2",
-    "@jupyterlab/mainmenu": "^3.0.0-rc.2",
-    "@jupyterlab/nbformat": "^3.0.0-rc.2",
-    "@jupyterlab/translation": "^3.0.0-rc.2",
+    "@jupyterlab/application": "^3.0.0-rc.7",
+    "@jupyterlab/launcher": "^3.0.0-rc.7",
+    "@jupyterlab/mainmenu": "^3.0.0-rc.7",
+    "@jupyterlab/nbformat": "^3.0.0-rc.7",
+    "@jupyterlab/translation": "^3.0.0-rc.7",
     "@lumino/algorithm": "^1.3.3",
     "@lumino/coreutils": "^1.5.3",
     "@lumino/datagrid": "^0.5.2",
     "@lumino/disposable": "^1.4.3",
     "@lumino/widgets": "^1.14.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.0-rc.2",
+    "@jupyterlab/builder": "^3.0.0-rc.7",
     "@typescript-eslint/eslint-plugin": "^2.27.0",
     "@typescript-eslint/parser": "^2.27.0",
     "eslint": "^7.5.0",
@@ -73,6 +74,6 @@
   ],
   "jupyterlab": {
     "extension": true,
-    "outputDir": "jupyterlab_examples_kernel_messaging/static"
+    "outputDir": "jupyterlab_examples_kernel_messaging/labextension"
   }
 }
diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py
@@ -1,6 +1,7 @@
 """
 jupyterlab_examples_kernel_messaging setup
 """
+import json
 import os
 
 from jupyter_packaging import (
@@ -15,14 +16,15 @@
 name="jupyterlab_examples_kernel_messaging"
 
 # Get our version
-version = get_version(os.path.join(name, "_version.py"))
+with open(os.path.join(HERE, 'package.json')) as f:
+    version = json.load(f)['version']
 
-lab_path = os.path.join(HERE, name, "static")
+lab_path = os.path.join(HERE, name, "labextension")
 
 # Representative files that should exist after a successful build
 jstargets = [
     os.path.join(HERE, "lib", "index.js"),
-    os.path.join(HERE, name, "static", "package.json"),
+    os.path.join(lab_path, "package.json"),
 ]
 
 package_data_spec = {
@@ -34,7 +36,8 @@
 labext_name = "@jupyterlab-examples/kernel-messaging"
 
 data_files_spec = [
-    ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"),
+    ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"),
+    ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),
 ]
 
 cmdclass = create_cmdclass("jsdeps",
@@ -43,7 +46,7 @@
 )
 
 cmdclass["jsdeps"] = combine_commands(
-    install_npm(HERE, build_cmd="build", npm=["jlpm"]),
+    install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]),
     ensure_targets(jstargets),
 )
 

diff --git a/advanced/kernel-output/MANIFEST.in b/advanced/kernel-output/MANIFEST.in
@@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_kernel_output.json
 include package.json
 include ts*.json
 
-graft jupyterlab_examples_kernel_output/static
+graft jupyterlab_examples_kernel_output/labextension
 
 # Javascript files
 graft src

diff --git a/advanced/kernel-output/install.json b/advanced/kernel-output/install.json
@@ -0,0 +1,5 @@
+{
+  "packageManager": "python",
+  "packageName": "jupyterlab_examples_kernel_output",
+  "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_kernel_output"
+}
diff --git a/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py b/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py
@@ -6,12 +6,12 @@
 
 HERE = osp.abspath(osp.dirname(__file__))
 
-with open(osp.join(HERE, 'static', 'package.json')) as fid:
+with open(osp.join(HERE, 'labextension', 'package.json')) as fid:
     data = json.load(fid)
 
 def _jupyter_labextension_paths():
     return [{
-        'src': 'static',
+        'src': 'labextension',
         'dest': data['name']
     }]
 

diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json
@@ -25,36 +25,37 @@
     "url": "https://github.com/jupyterlab/extension-examples.git"
   },
   "scripts": {
-    "build": "jlpm run build:lib && jlpm run build:labextension",
+    "build": "jlpm run build:lib && jlpm run build:labextension:dev",
     "build:all": "jlpm run build:lib && jlpm run build:labextension",
     "build:labextension": "jupyter labextension build .",
     "build:labextension:dev": "jupyter labextension build --development True .",
     "build:lib": "tsc",
+    "build:prod": "jlpm run build:lib && jlpm run build:labextension",
     "clean": "jlpm run clean:lib",
     "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
-    "clean:labextension": "rimraf jupyterlab_examples_kernel_output/static",
+    "clean:labextension": "rimraf jupyterlab_examples_kernel_output/labextension",
     "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
     "eslint": "eslint . --ext .ts,.tsx --fix",
     "eslint:check": "eslint . --ext .ts,.tsx",
     "install:extension": "jupyter labextension develop --overwrite .",
-    "prepare": "jlpm run clean && jlpm run build",
+    "prepare": "jlpm run clean && jlpm run build:prod",
     "watch": "run-p watch:src watch:labextension",
     "watch:labextension": "jupyter labextension watch .",
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.0.0-rc.2",
-    "@jupyterlab/launcher": "^3.0.0-rc.2",
-    "@jupyterlab/mainmenu": "^3.0.0-rc.2",
-    "@jupyterlab/outputarea": "^3.0.0-rc.2",
-    "@jupyterlab/translation": "^3.0.0-rc.2",
+    "@jupyterlab/application": "^3.0.0-rc.7",
+    "@jupyterlab/launcher": "^3.0.0-rc.7",
+    "@jupyterlab/mainmenu": "^3.0.0-rc.7",
+    "@jupyterlab/outputarea": "^3.0.0-rc.7",
+    "@jupyterlab/translation": "^3.0.0-rc.7",
     "@lumino/algorithm": "^1.3.3",
     "@lumino/coreutils": "^1.5.3",
     "@lumino/datagrid": "^0.3.1",
     "@lumino/disposable": "^1.4.3"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.0-rc.2",
+    "@jupyterlab/builder": "^3.0.0-rc.7",
     "@typescript-eslint/eslint-plugin": "^2.27.0",
     "@typescript-eslint/parser": "^2.27.0",
     "eslint": "^7.5.0",
@@ -72,6 +73,6 @@
   ],
   "jupyterlab": {
     "extension": true,
-    "outputDir": "jupyterlab_examples_kernel_output/static"
+    "outputDir": "jupyterlab_examples_kernel_output/labextension"
   }
 }
diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py
@@ -1,6 +1,7 @@
 """
 jupyterlab_examples_kernel_output setup
 """
+import json
 import os
 
 from jupyter_packaging import (
@@ -15,14 +16,15 @@
 name="jupyterlab_examples_kernel_output"
 
 # Get our version
-version = get_version(os.path.join(name, "_version.py"))
+with open(os.path.join(HERE, 'package.json')) as f:
+    version = json.load(f)['version']
 
-lab_path = os.path.join(HERE, name, "static")
+lab_path = os.path.join(HERE, name, "labextension")
 
 # Representative files that should exist after a successful build
 jstargets = [
     os.path.join(HERE, "lib", "index.js"),
-    os.path.join(HERE, name, "static", "package.json"),
+    os.path.join(lab_path, "package.json"),
 ]
 
 package_data_spec = {
@@ -34,7 +36,8 @@
 labext_name = "@jupyterlab-examples/kernel-output"
 
 data_files_spec = [
-    ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"),
+    ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"),
+    ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),
 ]
 
 cmdclass = create_cmdclass("jsdeps",
@@ -43,7 +46,7 @@
 )
 
 cmdclass["jsdeps"] = combine_commands(
-    install_npm(HERE, build_cmd="build", npm=["jlpm"]),
+    install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]),
     ensure_targets(jstargets),
 )
 

diff --git a/advanced/server-extension/MANIFEST.in b/advanced/server-extension/MANIFEST.in
@@ -7,7 +7,7 @@ include jupyter-config/jlab_ext_example.json
 include package.json
 include ts*.json
 include jlab_ext_example/labextension/*.tgz
-graft jlab_ext_example/static
+graft jlab_ext_example/labextension
 
 # Javascript files
 graft src
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ node_modules/
		/node_modules//README.md

		static
		labextension