Merge pull request #2817 from jasongrout/updatejlab2

Update for jlab 2.0.1 final

Author: jasongrout

docs/source/dev_release.md

@@ -28,7 +28,8 @@ First, update the relevant model specification versions. For example, the commit
 
 Next, regenerate the model spec with the new version numbers by doing something like this in the repository root directory:
 ```
-python ./packages/schema/generate-spec.py > packages/schema/jupyterwidgetmodels.latest.md
+python ./packages/schema/generate-spec.py -f json-pretty > packages/schema/jupyterwidgetmodels.latest.json
+python ./packages/schema/generate-spec.py -f markdown > packages/schema/jupyterwidgetmodels.latest.md
 ```
 
 Copy `packages/schema/jupyterwidgetmodels.latest.md` to an appropriately-named
@@ -47,10 +48,12 @@ git pull origin master
 git reset --hard origin/master
 git clean -fdx
 yarn install
+yarn run version
+# Check the latest commit to make sure it is correct
 yarn run publish
 ```
 
-Lerna will prompt you for version numbers for each of the changed npm packages. Lerna will then change the versions appropriately (including the interdependency versions), commit, tag, and publish the new packages to npm.
+Lerna will prompt you for version numbers for each of the changed npm packages in the version step. Lerna will then change the versions appropriately (including the interdependency versions), commit, and tag. The `yarn run publish` step then publishes the public packages that were versioned to npm.
 
 ### widgetsnbextension
 

examples/web3/package.json

@@ -17,8 +17,8 @@
     "@jupyter-widgets/base": "^2.0.2",
     "@jupyter-widgets/controls": "^1.5.3",
     "@jupyter-widgets/html-manager": "^0.18.4",
-    "@jupyterlab/services": "^5.0.0-beta.2",
-    "@lumino/widgets": "^1.3.0",
+    "@jupyterlab/services": "^5.0.2",
+    "@lumino/widgets": "^1.11.1",
     "codemirror": "^5.48.0",
     "font-awesome": "^4.7.0",
     "http-server": "^0.11.1"

ipywidgets/_version.py

@@ -9,9 +9,9 @@
   '' if version_info[3]=='final' else _specifier_[version_info[3]]+str(version_info[4]))
 
 __protocol_version__ = '2.0.0'
-__jupyter_widgets_base_version__ = '1.2.0'
+__jupyter_widgets_base_version__ = '2.0.0'
 __jupyter_widgets_output_version__ = '1.0.0'
-__jupyter_widgets_controls_version__ = '1.5.0'
+__jupyter_widgets_controls_version__ = '2.0.0'
 
 # A compatible @jupyter-widgets/html-manager npm package semver range
 __html_manager_version__ = '^0.18.0'

package.json

@@ -5,31 +5,33 @@
     "widgetsnbextension",
     "examples/*"
   ],
-  "engines": {
-    "npm": "please-use-yarn",
-    "node": ">=10.15.3",
-    "yarn": ">=1.15.0"
-  },
   "scripts": {
     "build": "lerna run build --ignore \"@jupyter-widgets/example-*\"",
     "build:examples": "lerna run build --scope \"@jupyter-widgets/example-*\" --include-filtered-dependencies",
     "build:test": "lerna run build:test --ignore \"@jupyter-widgets/example-*\"",
     "clean": "lerna run clean",
-    "integrity": "node scripts/package-integrity.js",
     "eslint": "eslint . --fix --ignore-path .gitignore --ext .ts,.tsx",
     "eslint:check": "eslint . --ignore-path .gitignore --ext .ts,.tsx",
+    "integrity": "node scripts/package-integrity.js",
     "integrity2": "node buildutils/lib/integrity.js",
     "lint": "yarn && yarn run prettier && yarn run eslint",
     "lint:check": "yarn run prettier:check && yarn run eslint:check",
     "prettier": "prettier --ignore-path .gitignore --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json}\"",
     "prettier:check": "prettier --ignore-path .gitignore --check \"**/*{.ts,.tsx,.js,.jsx,.css,.json}\"",
+    "publish": "yarn run clean && yarn run build && lerna publish --pre-dist-tag next from-git",
     "sort-package-json": "lerna exec --parallel sort-package-json && sort-package-json",
-    "publish": "yarn run clean && yarn run build && lerna publish -m \"Publish npm packages\"",
     "update-dependency": "update-dependency --lerna",
-    "updated": "lerna updated"
+    "updated": "lerna updated",
+    "version": "yarn run clean && yarn run build && lerna version --no-push -m \"Bump version\" "
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "yarn run integrity"
+    }
   },
   "devDependencies": {
-    "@jupyterlab/buildutils": "^2.0.0-beta.2",
+    "@jupyterlab/buildutils": "^2.0.2",
     "@typescript-eslint/eslint-plugin": "^2.14.0",
     "@typescript-eslint/parser": "^2.14.0",
     "eslint": "^6.5.0",
@@ -40,10 +42,9 @@
     "prettier": "^1.19.1",
     "sort-package-json": "~1.35"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "pre-push": "yarn run integrity"
-    }
+  "engines": {
+    "node": ">=10.15.3",
+    "npm": "please-use-yarn",
+    "yarn": ">=1.15.0"
   }
 }

packages/base-manager/package.json

@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@jupyter-widgets/base": "^2.0.2",
-    "@jupyterlab/services": "^5.0.0-beta.2",
-    "@lumino/coreutils": "^1.2.0",
+    "@jupyterlab/services": "^5.0.2",
+    "@lumino/coreutils": "^1.4.2",
     "base64-js": "^1.2.1"
   },
   "devDependencies": {

packages/base/package.json

@@ -32,10 +32,10 @@
     "test:unit:ie": "npm run test:unit:default -- --browsers=IE"
   },
   "dependencies": {
-    "@jupyterlab/services": "^5.0.0-beta.2",
-    "@lumino/coreutils": "^1.2.0",
-    "@lumino/messaging": "^1.2.1",
-    "@lumino/widgets": "^1.3.0",
+    "@jupyterlab/services": "^5.0.2",
+    "@lumino/coreutils": "^1.4.2",
+    "@lumino/messaging": "^1.3.3",
+    "@lumino/widgets": "^1.11.1",
     "@types/backbone": "^1.4.1",
     "@types/lodash": "^4.14.134",
     "backbone": "1.2.3",

packages/base/src/version.ts

@@ -1,6 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-export const JUPYTER_WIDGETS_VERSION = '1.2.0';
+export const JUPYTER_WIDGETS_VERSION = '2.0.0';
 
 export const PROTOCOL_VERSION = '2.0.0';

packages/base/test/src/widget_test.ts

@@ -602,10 +602,10 @@ describe('WidgetModel', function() {
       expect(this.widget.get_state()).to.deep.equal({
         _model_module: '@jupyter-widgets/base',
         _model_name: 'WidgetModel',
-        _model_module_version: '1.2.0',
+        _model_module_version: '2.0.0',
         _view_module: '@jupyter-widgets/base',
         _view_name: null,
-        _view_module_version: '1.2.0',
+        _view_module_version: '2.0.0',
         _view_count: null,
         a: 'get_state test'
       });

packages/controls/package.json

@@ -35,17 +35,17 @@
   },
   "dependencies": {
     "@jupyter-widgets/base": "^2.0.2",
-    "@lumino/algorithm": "^1.1.0",
-    "@lumino/domutils": "^1.1.0",
-    "@lumino/messaging": "^1.2.1",
-    "@lumino/signaling": "^1.2.0",
-    "@lumino/widgets": "^1.3.0",
+    "@lumino/algorithm": "^1.2.3",
+    "@lumino/domutils": "^1.1.7",
+    "@lumino/messaging": "^1.3.3",
+    "@lumino/signaling": "^1.3.5",
+    "@lumino/widgets": "^1.11.1",
     "d3-format": "^1.3.0",
     "jquery": "^3.1.1",
     "nouislider": "^14.1.1"
   },
   "devDependencies": {
-    "@jupyterlab/services": "^5.0.0-beta.2",
+    "@jupyterlab/services": "^5.0.2",
     "@types/d3-format": "^1.3.1",
     "@types/expect.js": "^0.3.29",
     "@types/mathjax": "^0.0.35",

packages/controls/src/version.ts

@@ -5,4 +5,4 @@
  * The version of the Jupyter controls widget attribute spec that this package
  * implements.
  */
-export const JUPYTER_CONTROLS_VERSION = '1.5.0';
+export const JUPYTER_CONTROLS_VERSION = '2.0.0';