Update to the latest rc

mateusz-garlacz · Nov 5, 2020 · ad6fac7 · ad6fac7
1 parent bd34397
commit ad6fac7
Show file tree

Hide file tree

Showing 53 changed files with 371 additions and 218 deletions.
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/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",

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/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/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",

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/install.json b/advanced/server-extension/install.json
@@ -0,0 +1,5 @@
+{
+  "packageManager": "python",
+  "packageName": "jlab_ext_example",
+  "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jlab_ext_example"
+}
diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json
@@ -25,31 +25,32 @@
     "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 jlab_ext_example/static",
+    "clean:labextension": "rimraf jlab_ext_example/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/coreutils": "^5.0.0-rc.2",
-    "@jupyterlab/launcher": "^3.0.0-rc.2",
-    "@jupyterlab/services": "^6.0.0-rc.2"
+    "@jupyterlab/application": "^3.0.0-rc.7",
+    "@jupyterlab/coreutils": "^5.0.0-rc.7",
+    "@jupyterlab/launcher": "^3.0.0-rc.7",
+    "@jupyterlab/services": "^6.0.0-rc.7"
   },
   "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",

diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py
@@ -1,6 +1,7 @@
 """
 jlab_ext_example setup
 """
+import json
 import os
 
 from jupyter_packaging import (
@@ -15,14 +16,15 @@
 name="jlab_ext_example"
 
 # 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/server-extension"
 
 data_files_spec = [
-    ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"),("etc/jupyter/jupyter_server_config.d",
+    ("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", "jlab_ext_example.json"),
 
 ]
@@ -45,7 +48,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/basics/datagrid/install.json b/basics/datagrid/install.json
@@ -0,0 +1,5 @@
+{
+  "packageManager": "python",
+  "packageName": "jupyterlab_examples_datagrid",
+  "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_datagrid"
+}
diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json
@@ -25,34 +25,35 @@
     "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_datagrid/static",
+    "clean:labextension": "rimraf jupyterlab_examples_datagrid/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/mainmenu": "^3.0.0-rc.2",
-    "@jupyterlab/translation": "^3.0.0-rc.2",
+    "@jupyterlab/application": "^3.0.0-rc.7",
+    "@jupyterlab/mainmenu": "^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"
   },
   "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",

diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py
@@ -1,6 +1,7 @@
 """
 jupyterlab_examples_datagrid setup
 """
+import json
 import os
 
 from jupyter_packaging import (
@@ -15,14 +16,15 @@
 name="jupyterlab_examples_datagrid"
 
 # 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/datagrid"
 
 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/basics/hello-world/README.md b/basics/hello-world/README.md
@@ -95,7 +95,7 @@ package is declared in the file `package.json`:
 
 },
 "dependencies": {
-  "@jupyterlab/application": "^3.0.0-rc.2"
+  "@jupyterlab/application": "^3.0.0-rc.7"
 ```
 
 With this basic import setup, you can move on to construct a new instance