Merge pull request #2654 from jasongrout/upgrades

Package upgrades
jupyter-widgets · Jan 2, 2020 · 9f15bd7 · 9f15bd7
2 parents 41274b7 + 560c5a2
commit 9f15bd7
Show file tree

Hide file tree

Showing 38 changed files with 2,778 additions and 2,399 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ python:
  - 3.5
  - 3.6
  - 3.7
+ - 3.8
 addons:
  apt_packages:
  - pandoc
@@ -23,6 +24,7 @@ before_install:
  - 'if [[ $GROUP == python ]] ; then bash ./scripts/travis_before_install_py.sh ; fi'
  - 'if [[ $GROUP == doc ]] ; then bash ./scripts/travis_before_install_py.sh ; fi'
  - 'if [[ $GROUP == spec ]] ; then bash ./scripts/travis_before_install_py.sh ; fi'
+ - 'if [[ $GROUP == js ]] ; then nvm install 12 ; fi'
 install:
  - 'if [[ $GROUP == python ]] ; then bash ./scripts/travis_install_py.sh ; fi'
  - 'if [[ $GROUP == doc ]] ; then bash ./scripts/travis_install_py.sh ; fi'
@@ -40,6 +42,6 @@ matrix:
  - python: 3.6
  env: GROUP=doc
  - python: 3.6
- env: GROUP=js BROWSER=firefox TRAVIS_NODE_VERSION=6.11.0
+ env: GROUP=js BROWSER=firefox
 after_success:
  - coveralls
diff --git a/examples/web1/manager.js b/examples/web1/manager.js
@@ -1,6 +1,6 @@
 var base = require('@jupyter-widgets/base');
 var controls = require('@jupyter-widgets/controls');
-var PhosphorWidget = require('@phosphor/widgets').Widget;
+var PhosphorWidget = require('@lumino/widgets').Widget;
 
 class WidgetManager extends base.ManagerBase {
  constructor(el) {

diff --git a/examples/web1/package.json b/examples/web1/package.json
@@ -21,17 +21,16 @@
  },
  "devDependencies": {
  "chai": "^4.0.0",
- "css-loader": "^3.0.0",
- "file-loader": "^4.0.0",
- "json-loader": "^0.5.7",
+ "css-loader": "^3.4.0",
+ "file-loader": "^5.0.2",
  "karma": "^4.1.0",
  "karma-chai": "^0.1.0",
  "karma-chrome-launcher": "^2.2.0",
  "karma-firefox-launcher": "^1.1.0",
  "karma-mocha": "^1.3.0",
  "karma-mocha-reporter": "^2.2.5",
  "mocha": "^6.1.4",
- "style-loader": "^0.23.1",
- "webpack": "^4.35.0"
+ "style-loader": "^1.1.2",
+ "webpack": "^4.41.5"
  }
 }
diff --git a/examples/web2/manager.js b/examples/web2/manager.js
@@ -1,6 +1,6 @@
 var base = require('@jupyter-widgets/base');
 var controls = require('@jupyter-widgets/controls');
-var PhosphorWidget = require('@phosphor/widgets').Widget;
+var PhosphorWidget = require('@lumino/widgets').Widget;
 
 class WidgetManager extends base.ManagerBase {
  constructor(el) {

diff --git a/examples/web2/package.json b/examples/web2/package.json
@@ -19,12 +19,11 @@
  "font-awesome": "^4.7.0"
  },
  "devDependencies": {
- "css-loader": "^3.0.0",
- "file-loader": "^4.0.0",
- "json-loader": "^0.5.7",
- "raw-loader": "^3.0.0",
- "style-loader": "^0.23.1",
- "url-loader": "^2.0.0",
- "webpack": "^4.35.0"
+ "css-loader": "^3.4.0",
+ "file-loader": "^5.0.2",
+ "raw-loader": "^4.0.0",
+ "style-loader": "^1.1.2",
+ "url-loader": "^3.0.0",
+ "webpack": "^4.41.5"
  }
 }
diff --git a/examples/web3/package.json b/examples/web3/package.json
@@ -18,28 +18,27 @@
  "@jupyter-widgets/base": "^2.0.2",
  "@jupyter-widgets/controls": "^1.5.3",
  "@jupyter-widgets/html-manager": "^0.18.4",
- "@jupyterlab/services": "^4.0.0",
- "@phosphor/widgets": "^1.3.0",
+ "@jupyterlab/services": "^5.0.0-beta.1",
+ "@lumino/widgets": "^1.3.0",
  "codemirror": "^5.48.0",
  "font-awesome": "^4.7.0",
  "http-server": "^0.11.1"
  },
  "devDependencies": {
  "@types/codemirror": "^0.0.74",
  "@types/requirejs": "^2.1.31",
- "css-loader": "^3.0.0",
- "file-loader": "^4.0.0",
+ "css-loader": "^3.4.0",
+ "file-loader": "^5.0.2",
  "fs-extra": "^8.0.1",
- "json-loader": "^0.5.7",
  "postcss": "^7.0.17",
  "postcss-cssnext": "^3.1.0",
  "postcss-import": "^12.0.1",
  "postcss-loader": "^3.0.0",
  "rimraf": "^2.6.1",
- "style-loader": "^0.23.1",
- "tslint": "^5.18.0",
- "typescript": "~3.5.2",
- "url-loader": "^2.0.0",
- "webpack": "^4.35.0"
+ "style-loader": "^1.1.2",
+ "tslint": "^5.20.1",
+ "typescript": "~3.7.4",
+ "url-loader": "^3.0.0",
+ "webpack": "^4.41.5"
  }
 }
diff --git a/examples/web3/src/index.ts b/examples/web3/src/index.ts
@@ -7,59 +7,54 @@ import {
 } from './manager';
 
 import {
- Kernel, ServerConnection, KernelMessage
+ KernelManager, ServerConnection, KernelMessage
 } from '@jupyterlab/services';
 
 let BASEURL = prompt('Notebook BASEURL', 'http://localhost:8888');
 let WSURL = 'ws:' + BASEURL.split(':').slice(1).join(':');
 
-document.addEventListener('DOMContentLoaded', function(event) {
+document.addEventListener('DOMContentLoaded', async function(event) {
 
  // Connect to the notebook webserver.
  let connectionInfo = ServerConnection.makeSettings({
  baseUrl: BASEURL,
  wsUrl: WSURL
  });
- Kernel.getSpecs(connectionInfo).then(kernelSpecs => {
- return Kernel.startNew({
- name: kernelSpecs.default,
- serverSettings: connectionInfo
- });
- }).then(kernel => {
-
- // Create a codemirror instance
- let code = require('../widget_code.json').join('\n');
- let inputarea = document.getElementsByClassName('inputarea')[0] as HTMLElement;
- CodeMirror(inputarea, {
- value: code,
- mode: 'python',
- tabSize: 4,
- showCursorWhenSelecting: true,
- viewportMargin: Infinity,
- readOnly: true
- });
-
- // Create the widget area and widget manager
- let widgetarea = document.getElementsByClassName('widgetarea')[0] as HTMLElement;
- let manager = new WidgetManager(kernel, widgetarea);
+ let kernelManager = new KernelManager({serverSettings: connectionInfo});
+ let kernel = await kernelManager.startNew();
+
+ // Create a codemirror instance
+ let code = require('../widget_code.json').join('\n');
+ let inputarea = document.getElementsByClassName('inputarea')[0] as HTMLElement;
+ CodeMirror(inputarea, {
+ value: code,
+ mode: 'python',
+ tabSize: 4,
+ showCursorWhenSelecting: true,
+ viewportMargin: Infinity,
+ readOnly: true
+ });
 
- // Run backend code to create the widgets. You could also create the
- // widgets in the frontend, like the other widget examples demonstrate.
- let execution = kernel.requestExecute({ code: code });
- execution.onIOPub = (msg) => {
- // If we have a display message, display the widget.
- if (KernelMessage.isDisplayDataMsg(msg)) {
- let widgetData: any = msg.content.data['application/vnd.jupyter.widget-view+json'];
- if (widgetData !== undefined && widgetData.version_major === 2) {
- let model = manager.get_model(widgetData.model_id);
- if (model !== undefined) {
- model.then(model => {
- manager.display_model(msg, model);
- });
- }
+ // Create the widget area and widget manager
+ let widgetarea = document.getElementsByClassName('widgetarea')[0] as HTMLElement;
+ let manager = new WidgetManager(kernel, widgetarea);
+
+ // Run backend code to create the widgets. You could also create the
+ // widgets in the frontend, like the other widget examples demonstrate.
+ let execution = kernel.requestExecute({ code: code });
+ execution.onIOPub = (msg) => {
+ // If we have a display message, display the widget.
+ if (KernelMessage.isDisplayDataMsg(msg)) {
+ let widgetData: any = msg.content.data['application/vnd.jupyter.widget-view+json'];
+ if (widgetData !== undefined && widgetData.version_major === 2) {
+ let model = manager.get_model(widgetData.model_id);
+ if (model !== undefined) {
+ model.then(model => {
+ manager.display_model(msg, model);
+ });
  }
  }
- };
- });
+ }
+ };
 });
 
diff --git a/examples/web3/src/manager.ts b/examples/web3/src/manager.ts
@@ -1,5 +1,5 @@
 import * as base from '@jupyter-widgets/base';
-import * as pWidget from '@phosphor/widgets';
+import * as pWidget from '@lumino/widgets';
 
 import {
  Kernel
@@ -39,7 +39,7 @@ class WidgetManager extends HTMLManager {
  * Create a comm.
  */
  async _create_comm(target_name: string, model_id: string, data?: any, metadata?: any): Promise<base.shims.services.Comm> {
- let comm = await this.kernel.connectToComm(target_name, model_id);
+ let comm = this.kernel.createComm(target_name, model_id);
  if (data || metadata) {
  comm.open(data, metadata);
  }

diff --git a/examples/web4/package.json b/examples/web4/package.json
@@ -17,10 +17,10 @@
  "font-awesome": "^4.7.0"
  },
  "devDependencies": {
- "css-loader": "^3.0.0",
- "file-loader": "^4.0.0",
- "style-loader": "^0.23.1",
- "url-loader": "^2.0.0",
- "webpack": "^4.35.0"
+ "css-loader": "^3.4.0",
+ "file-loader": "^5.0.2",
+ "style-loader": "^1.1.2",
+ "url-loader": "^3.0.0",
+ "webpack": "^4.41.5"
  }
 }
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
  "updated": "lerna updated"
  },
  "devDependencies": {
- "@jupyterlab/buildutils": "^1.0.0-rc.0",
+ "@jupyterlab/buildutils": "^2.0.0-beta.1",
  "lerna": "^3.2.1"
  }
 }
diff --git a/packages/base/package.json b/packages/base/package.json
@@ -33,10 +33,10 @@
  "test:unit:ie": "npm run test:unit:default -- --browsers=IE"
  },
  "dependencies": {
- "@jupyterlab/services": "^4.0.0",
- "@phosphor/coreutils": "^1.2.0",
- "@phosphor/messaging": "^1.2.1",
- "@phosphor/widgets": "^1.3.0",
+ "@jupyterlab/services": "^5.0.0-beta.1",
+ "@lumino/coreutils": "^1.2.0",
+ "@lumino/messaging": "^1.2.1",
+ "@lumino/widgets": "^1.3.0",
  "@types/backbone": "^1.4.1",
  "@types/lodash": "^4.14.134",
  "backbone": "1.2.3",
@@ -69,8 +69,8 @@
  "rimraf": "^2.6.1",
  "sinon": "^7.3.2",
  "sinon-chai": "^3.3.0",
- "tslint": "^5.18.0",
- "typescript": "~3.5.2",
- "webpack": "^4.35.0"
+ "tslint": "^5.20.1",
+ "typescript": "~3.7.4",
+ "webpack": "^4.41.5"
  }
 }
diff --git a/packages/base/src/registry.ts b/packages/base/src/registry.ts
@@ -3,7 +3,7 @@
 
 import {
  Token
-} from '@phosphor/coreutils';
+} from '@lumino/coreutils';
 
 import {
  WidgetModel, WidgetView

diff --git a/packages/base/src/services-shim.ts b/packages/base/src/services-shim.ts
@@ -90,15 +90,15 @@ namespace shims {
  */
  export
  class CommManager {
- constructor(jsServicesKernel: Kernel.IKernel) {
+ constructor(jsServicesKernel: Kernel.IKernelConnection) {
  this.init_kernel(jsServicesKernel);
  }
 
  /**
  * Hookup kernel events.
  * @param {Kernel.IKernel} jsServicesKernel - @jupyterlab/services Kernel.IKernel instance
  */
- init_kernel(jsServicesKernel: Kernel.IKernel) {
+ init_kernel(jsServicesKernel: Kernel.IKernelConnection) {
  this.kernel = jsServicesKernel; // These aren't really the same.
  this.jsServicesKernel = jsServicesKernel;
  }
@@ -107,7 +107,7 @@ namespace shims {
  * Creates a new connected comm
  */
  async new_comm(target_name: string, data: any, callbacks: any, metadata: any, comm_id: string, buffers?: ArrayBuffer[] | ArrayBufferView[]): Promise<Comm> {
- let c = await Promise.resolve(this.jsServicesKernel.connectToComm(target_name, comm_id));
+ let c = this.jsServicesKernel.createComm(target_name, comm_id);
  let comm = new Comm(c);
  this.register_comm(comm);
  comm.open(data, callbacks, metadata, buffers);
@@ -160,8 +160,8 @@ namespace shims {
 
  targets = Object.create(null);
  comms = Object.create(null);
- kernel: Kernel.IKernel = null;
- jsServicesKernel: Kernel.IKernel = null;
+ kernel: Kernel.IKernelConnection = null;
+ jsServicesKernel: Kernel.IKernelConnection = null;
  }
 
  /**
@@ -289,7 +289,7 @@ namespace shims {
  }
 
  jsServicesComm: Kernel.IComm = null;
- kernel: Kernel.IKernel = null;
+ kernel: Kernel.IKernelConnection = null;
  }
  }
 }
diff --git a/packages/base/src/utils.ts b/packages/base/src/utils.ts
@@ -7,7 +7,7 @@ import {
 
 import {
  UUID
-} from '@phosphor/coreutils';
+} from '@lumino/coreutils';
 
 import _isEqual from 'lodash/isEqual';
 import isPlainObject from 'lodash/isPlainObject';

diff --git a/packages/base/src/widget.ts b/packages/base/src/widget.ts
@@ -14,11 +14,11 @@ import {
 
 import {
  Widget, Panel
-} from '@phosphor/widgets';
+} from '@lumino/widgets';
 
 import {
  Message, MessageLoop
-} from '@phosphor/messaging';
+} from '@lumino/messaging';
 
 import {
  IClassicComm, ICallbacks