build(deps): update dependencies

Author: sgratzl

.gitignore

@@ -63,6 +63,7 @@ instance/
 docs/_build/
 docs/source/_static/embed-bundle.js
 docs/source/_static/embed-bundle.js.map
+docs/source/_static/embed-bundle.js.LICENSE.txt
 
 # PyBuilder
 target/

Pipfile.lock

@@ -10,25 +10,13 @@ This package is part of the UpSet.js ecosystem located at the main [Github Monor
 
 You can install using `pip`:
 
-jupyter-lab 1.2.x:
-
-```bash
-pip install ipywidgets==7.5.1 upsetjs_jupyter_widget
-# for notebooks
-jupyter nbextension enable --sys-prefix --py upsetjs_jupyter_widget
-# for lab
-jupyter labextension install @jupyter-widgets/jupyterlab-manager @upsetjs_jupyter_widget
-```
-
-jupyter-lab 2.1.x:
-
 ```bash
 # some ipywidget 8.x.x alpha vesion
 pip install ipywidgets upsetjs_jupyter_widget
 # for notebooks
 jupyter nbextension enable --sys-prefix --py upsetjs_jupyter_widget
 # for lab
-jupyter labextension install @jupyter-widgets/jupyterlab-manager@3.0.0-alpha.0 @upsetjs_jupyter_widget
+jupyter labextension install @jupyter-widgets/jupyterlab-manager upsetjs_jupyter_widget
 ```
 
 ## Usage
@@ -115,16 +103,15 @@ npm i -g yarn
 yarn set version berry
 yarn
 yarn pnpify --sdk vscode
-pipenv
+conda create -f environment.yml
 ```
 
 ```sh
-pipenv shell
+conda activate upsetjs_jupyter_widget
 pip install -e .
 jupyter nbextension install --sys-prefix --overwrite --py upsetjs_jupyter_widget
 jupyter nbextension enable --sys-prefix --py upsetjs_jupyter_widget
-jupyter labextension install @jupyter-widgets/jupyterlab-manager@3.0.0-alpha.0
-jupyter labextension install .
+jupyter labextension install @jupyter-widgets/jupyterlab-manager .
 ```
 
 ### Commands

README.md

@@ -0,0 +1,10 @@
+name: upsetjs_jupyter_widget
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - python==3.9
+  - mypy
+  - pylint
+  - black
+  - bumpversion

environment.yml

@@ -34,71 +34,71 @@
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist build lib upsetjs_jupyter_widget/labextension upsetjs_jupyter_widget/nbextension/static/index*",
-    "build": "npm run build:lib && npm run build:nbextension",
+    "clean": "rimraf dist build lib upsetjs_jupyter_widget/labextension \"upsetjs_jupyter_widget/nbextension/static/index*\"",
+    "build": "yarn build:lib && yarn build:nbextension",
     "build:labextension": "mkdirp upsetjs_jupyter_widget/labextension && cd upsetjs_jupyter_widget/labextension && npm pack ../..",
-    "build:lib": "npm run clean && tsc -p tsconfig.build.json",
-    "build:nbextension": "webpack -p",
-    "build:all": "npm run build:lib && npm run build:labextension && npm run build:nbextension",
+    "build:lib": "yarn clean && tsc -p tsconfig.build.json",
+    "build:nbextension": "webpack --mode production",
+    "build:all": "yarn build:lib && yarn build:labextension && yarn build:nbextension",
     "build:p": "python setup.py clean sdist bdist_wheel",
-    "_prepack": "npm run build:lib",
-    "lint": "npm run eslint && npm run prettier:check",
-    "fix": "npm run eslint:fix && npm run prettier:write",
+    "_prepack": "yarn build:lib",
+    "lint": "yarn eslint && yarn prettier:check",
+    "fix": "yarn eslint:fix && yarn prettier:write",
     "prettier": "prettier \"*.{md,json,yml}\" .eslintrc.js webpack* .prettierrc.js \"{src,types,scripts,.github}/**\" \"{r_package,binder}/*.yml\"",
-    "prettier:write": "npm run prettier -- --write",
-    "prettier:check": "npm run prettier -- --check",
+    "prettier:write": "yarn prettier -- --write",
+    "prettier:check": "yarn prettier -- --check",
     "black": "black --target-version=py37 upsetjs_jupyter_widget setup.py setupbase.py",
     "eslint": "eslint src --ext .ts,.tsx",
-    "eslint:fix": "npm run eslint -- --fix",
-    "lint:p": "mypy -p upsetjs_jupyter_widget && npm run black -- --check && pylint upsetjs_jupyter_widget",
-    "fix:p": "npm run black",
+    "eslint:fix": "yarn eslint -- --fix",
+    "lint:p": "mypy -p upsetjs_jupyter_widget && yarn black -- --check && pylint upsetjs_jupyter_widget",
+    "fix:p": "yarnblack",
     "test:p": "pytest",
     "test": "jest --passWithNoTests",
     "watch": "npm-run-all -p 'watch:*'",
     "watch:lib": "tsc -w -p tsconfig.build.json",
-    "watch:nbextension": "webpack -w -d",
+    "watch:nbextension": "webpack -w --mode development --devtool sourcemap",
     "docs:p": "cd docs && sphinx-build -b html \"source\" \"build\"",
     "release": "release-it --disable-metrics --npm.skipChecks"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^2 || ^3 || ^4 || 4.0.0-alpha.0",
-    "@upsetjs/bundle": "~1.7.0",
-    "@upsetjs/venn.js": "^1.3.0"
+    "@jupyter-widgets/base": ">=2",
+    "@upsetjs/bundle": "~1.9.1",
+    "@upsetjs/venn.js": "^1.4.1"
   },
   "devDependencies": {
-    "@jupyterlab/services": "^5.2.5",
+    "@jupyterlab/services": "^6.0.3",
     "@phosphor/application": "^1.7.3",
     "@phosphor/widgets": "^1.9.3",
-    "@types/backbone": "^1.4.5",
-    "@types/jest": "^26.0.16",
-    "@typescript-eslint/eslint-plugin": "^4.9.0",
-    "@typescript-eslint/parser": "^4.9.0",
+    "@types/backbone": "^1.4.10",
+    "@types/jest": "^26.0.20",
+    "@typescript-eslint/eslint-plugin": "^4.15.1",
+    "@typescript-eslint/parser": "^4.15.1",
     "@yarnpkg/pnpify": "^2.4.0",
     "babel-eslint": "^10.1.0",
     "backbone": "^1.4.0",
-    "eslint": "^7.14.0",
-    "eslint-config-prettier": "^6.15.0",
+    "eslint": "^7.20.0",
+    "eslint-config-prettier": "^7.2.0",
     "eslint-config-react-app": "^6.0.0",
     "eslint-plugin-flowtype": "^5.2.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.2.0",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "jest": "^26.6.3",
     "jest-config": "^26.6.3",
     "mkdirp": "^1.0.4",
     "npm-run-all": "^4.1.5",
     "pnp-webpack-plugin": "^1.6.4",
     "prettier": "^2.2.1",
-    "release-it": "^14.2.2",
+    "release-it": "^14.4.0",
     "rimraf": "^3.0.2",
-    "ts-jest": "26.4.4",
-    "ts-loader": "^8.0.11",
-    "tslib": "^2.0.3",
-    "typescript": "^4.1.2",
-    "webpack": "^4.44.2",
-    "webpack-cli": "^3.3.12"
+    "ts-jest": "26.5.1",
+    "ts-loader": "^8.0.17",
+    "tslib": "^2.1.0",
+    "typescript": "^4.1.5",
+    "webpack": "^5.22.0",
+    "webpack-cli": "^4.5.0"
   },
   "jupyterlab": {
     "extension": "lib/plugin"

package.json

@@ -14,13 +14,13 @@ import { UpSetModel } from '.';
 
 describe('UpSet', () => {
   describe('UpSetModel', () => {
-    it('should be createable', () => {
+    it('should be create able', () => {
       let model = createTestModel(UpSetModel);
       expect(model).toBeInstanceOf(UpSetModel);
       expect(model.get('value')).toBeUndefined();
     });
 
-    // it('should be createable with a value', () => {
+    // it('should be create able with a value', () => {
     //   let state = { value: 'Foo Bar!' };
     //   let model = createTestModel(UpSetModel, state);
     //   expect(model).toBeInstanceOf(UpSetModel);

src/index.spec.ts

@@ -95,17 +95,17 @@ export class UpSetView extends DOMWidgetView {
     if (!s) {
       this.model.set('value', null);
     } else {
-      const setish: any = {
+      const setLike: any = {
         name: s.name,
         type: s.type,
         cardinality: s.cardinality,
         elems: s.elems.map((e) => this.elemToIndex.get(e)),
       };
       if (s.type !== 'set') {
-        setish.degree = s.degree;
-        setish.set_names = Array.from(s.sets).map((s) => s.name);
+        setLike.degree = s.degree;
+        setLike.set_names = Array.from(s.sets).map((s) => s.name);
       }
-      this.model.set('value', setish);
+      this.model.set('value', setLike);
     }
     this.props.selection = s;
     this.renderImpl();