Merge pull request #86 from jasongrout/8.0

8.0 compatibility

Author: jasongrout

.github/workflows/main.yml

@@ -20,27 +20,24 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
-    - name: Setup conda
-      uses: conda-incubator/setup-miniconda@v2
+    - name: Install node
+      uses: actions/setup-node@v3
       with:
-        mamba-version: "*"
-        channels: conda-forge
+        node-version: '16'
+        cache: 'yarn'
 
-    - name: Mamba install dependencies
-      shell: bash -l {0}
-      run: mamba install python=${{ matrix.python-version }} pip yarn ipywidgets=7.6 jupyterlab=3 pytest nbval
-
-    - name: Install sidecar
-      shell: bash -l {0}
-      run: pip install -e .
+    - name: Install Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+        cache: 'pip'
+        cache-dependency-path: setup.py
 
-    - name: Check installation files
-      shell: bash -l {0}
-      run: |
-        test -d $CONDA_PREFIX/share/jupyter/labextensions/@jupyter-widgets/jupyterlab-sidecar
-        test -f $CONDA_PREFIX/share/jupyter/labextensions/@jupyter-widgets/jupyterlab-sidecar/package.json
+    - run: pip install jupyterlab pytest nbval jupyter_packaging
+    - run: pip install -ve .
+    - run: jupyter labextension develop . --overwrite
 
     - name: Check labextension
       shell: bash -l {0}

.github/workflows/release.yml

@@ -13,16 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install node
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: '14.x'
-        registry-url: 'https://registry.npmjs.org'
+        node-version: '16'
 
     - name: Install Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.x'
 

package.json

@@ -5,9 +5,14 @@
   "keywords": [
     "jupyter",
     "jupyterlab",
-    "jupyterlab extension",
+    "jupyterlab-extension",
     "widgets"
   ],
+  "files": [
+    "lib/**/*.js",
+    "dist/*.js",
+    "css/*.css"
+  ],
   "homepage": "https://github.com/jupyter-widgets/jupyterlab-sidecar",
   "bugs": {
     "url": "https://github.com/jupyter-widgets/jupyterlab-sidecar/issues"
@@ -42,17 +47,26 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^4.0.0",
-    "@jupyter-widgets/jupyterlab-manager": "^3.0.0",
+    "@jupyter-widgets/base": "^4 || ^5 || ^6",
+    "@jupyter-widgets/jupyterlab-manager": "^3 || ^4 || ^5",
     "@jupyterlab/application": "^3.0.0",
     "@lumino/coreutils": "^1.5.3"
   },
   "devDependencies": {
+    "@babel/core": "^7.5.0",
+    "@babel/preset-env": "^7.5.0",
     "@jupyterlab/builder": "^3.0.0",
     "@types/expect.js": "^0.3.29",
     "@types/mocha": "^7.0.2",
     "@types/node": "^13.9.2",
+    "@types/webpack-env": "^1.13.6",
+    "@typescript-eslint/eslint-plugin": "^3.6.0",
+    "@typescript-eslint/parser": "^3.6.0",
     "expect.js": "^0.3.1",
+    "css-loader": "^3.2.0",
+    "eslint": "^7.4.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-prettier": "^3.1.4",
     "fs-extra": "^8.1.0",
     "json-loader": "^0.5.7",
     "karma": "^4.4.1",
@@ -65,10 +79,12 @@
     "mkdirp": "^1.0.3",
     "mocha": "^7.1.1",
     "npm-run-all": "^4.1.5",
+    "prettier": "^2.0.5",
     "rimraf": "^3.0.2",
-    "source-map-loader": "^0.2.4",
-    "ts-loader": "^6.2.1",
-    "typescript": "^3.8.3"
+    "source-map-loader": "^1.1.3",
+    "style-loader": "^1.0.0",
+    "ts-loader": "^8.0.0",
+    "typescript": "~4.1.3"
   },
   "jupyterlab": {
     "extension": "lib/plugin",

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["jupyter_packaging~=0.7.9", "jupyterlab~=3.0", "setuptools>=40.8.0", "wheel"]
+requires = ["jupyter_packaging~=0.12", "jupyterlab~=3.0", "setuptools>=40.8.0", "wheel"]
 build-backend = "setuptools.build_meta"

setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal=1
-
 [metadata]
 description-file = README.md
 license_file = LICENSE.txt

setup.py

@@ -23,9 +23,6 @@
 name = 'sidecar'
 labext_name = '@jupyter-widgets/jupyterlab-sidecar'
 
-# Ensure a valid python version
-ensure_python('>=3.6')
-
 # Get our version
 version = get_version(os.path.join(name, '_version.py'))
 
@@ -77,6 +74,7 @@
     author_email    = '[email protected]',
     url             = 'https://github.com/jupyter-widgets/jupyterlab-sidecar',
     license         = 'BSD',
+    python_requires = ">=3.7",
     platforms       = "Linux, Mac OS X, Windows",
     keywords        = ['Jupyter', 'Widgets', 'IPython'],
     classifiers     = [
@@ -85,10 +83,10 @@
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Framework :: Jupyter',
     ],
     include_package_data = True,

src/widget.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Project Jupyter.
 // Distributed under the terms of the Modified BSD License.
 
+import { DOMWidgetModel } from '@jupyter-widgets/base';
 import {
    output
 } from '@jupyter-widgets/jupyterlab-manager';
@@ -30,7 +31,8 @@ class SidecarModel extends output.OutputModel {
   initialize(attributes: any, options: any) {
     super.initialize(attributes, options);
 
-    this.widget_manager.display_model(undefined as any, this as any, {});
+    // create_view calls the view's render function, which will display this widget in the sidebar.
+    this.widget_manager.create_view(this as DOMWidgetModel, {})
   }
 
   static model_name = 'SidecarModel';

tests/src/utils.spec.ts

@@ -2,6 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 import * as widgets from '@jupyter-widgets/base';
+import{ ManagerBase } from '@jupyter-widgets/base-manager';
 import * as services from '@jupyterlab/services';
 import * as Backbone from 'backbone';
 
@@ -47,7 +48,7 @@ class MockComm {
 }
 
 export
-class DummyManager extends widgets.ManagerBase<HTMLElement> {
+class DummyManager extends ManagerBase {
     constructor() {
         super();
         this.el = window.document.createElement('div');