Merge branch 'main' into feat/interact-type-hints

corranwebster · corranwebster · commit 92813badac8e · 2024-06-14T07:06:52.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,5 @@ ui-tests/playwright-report
 **/lite/.cache
 **/*.doit.*
 **/docs/typedoc/
+
+.yarn
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -28,7 +28,8 @@ dependencies:
   - bqplot
   - ipykernel
   - ipyleaflet
-  - jupyterlite >=0.1.1,<0.2.0
+  - jupyterlite-core >=0.3.0,<0.4.0
+  - jupyterlite-pyodide-kernel
   - matplotlib-base
   - numpy
   - scikit-image
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -6,7 +6,8 @@ ipyleaflet
 jupyter-client
 jupyter-packaging
 jupyterlab >=4
-jupyterlite >=0.1.1<0.2.0
+jupyterlite-core >=0.3.0<0.4.0
+jupyterlite-pyodide-kernel >=0.3.0<0.4.0
 matplotlib
 myst-nb >=0.17,<0.18
 numpy
diff --git a/docs/source/_templates/demo.html b/docs/source/_templates/demo.html
@@ -20,7 +20,7 @@
         type="radio"
         name="demo-app"
         autocomplete="off"
-        value="{{ pathto('try/retro/index') }}?path=Widget%20List.ipynb"
+        value="{{ pathto('try/tree/index') }}?path=Widget%20List.ipynb"
       >
       <i class="fas fa-book"></i> Notebook
     </label>
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -131,7 +131,7 @@ def setup(app):
 rediraffe_redirects = {
     "typedoc/index": "_static/typedoc/index",
     "try/lab/index": "_static/lab/index",
-    "try/retro/index": "_static/retro/tree/index",
+    "try/tree/index": "_static/tree/index",
 }
 
 # -- html --------------------------
diff --git a/docs/source/dev_release.md b/docs/source/dev_release.md
@@ -58,11 +58,14 @@ Lerna will prompt you for version numbers for each of the changed npm packages i
 ## Configure twine username
 
 If you have 2FA on, make sure you have your `~/.pypirc` file set to:
+
 ```
 [pypi]
 username = __token__
 ```
+
 Or set the environment variable
+
 ```
 export TWINE_USERNAME=__token__
 ```
diff --git a/docs/source/examples.md b/docs/source/examples.md
@@ -2,5 +2,5 @@
 
 There is a subdirectory called examples in the GitHub repo for `ipywidgets`. In the samples subdirectory are two directories, notebooks and development.
 
-<iframe width="100%" height="100vw" src="_static/retro/notebooks/?path=examples/Widget%20List.ipynb">
+<iframe width="100%" height="100vw" src="_static/notebooks/?path=examples/Widget%20List.ipynb">
 </iframe>
diff --git a/docs/source/examples/Widget List.ipynb b/docs/source/examples/Widget List.ipynb
@@ -169,8 +169,8 @@
     "widgets.FloatLogSlider(\n",
     "    value=10,\n",
     "    base=10,\n",
-    "    min=-10, # max exponent of base\n",
-    "    max=10, # min exponent of base\n",
+    "    min=-10, # min exponent of base\n",
+    "    max=10, # max exponent of base\n",
     "    step=0.2, # exponent step\n",
     "    description='Log Slider'\n",
     ")"
diff --git a/examples/web1/package.json b/examples/web1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/example-web1",
-  "version": "8.0.9",
+  "version": "8.0.10",
   "private": true,
   "description": "Project that tests the ability to npm install jupyter-js-widgets within an npm project.",
   "license": "BSD-3-Clause",
@@ -16,9 +16,9 @@
     "test:firefox:headless": "npm run test:default -- --browsers=FirefoxHeadless"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.7",
-    "@jupyter-widgets/base-manager": "^1.0.8",
-    "@jupyter-widgets/controls": "^5.0.8"
+    "@jupyter-widgets/base": "^6.0.8",
+    "@jupyter-widgets/base-manager": "^1.0.9",
+    "@jupyter-widgets/controls": "^5.0.9"
   },
   "devDependencies": {
     "chai": "^4.0.0",
diff --git a/examples/web2/package.json b/examples/web2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/example-web2",
-  "version": "8.0.9",
+  "version": "8.0.10",
   "private": true,
   "description": "Project that tests the ability to npm install jupyter-js-widgets within an npm project.",
   "license": "BSD-3-Clause",
@@ -13,9 +13,9 @@
     "test:default": "echo \"No test specified\""
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.7",
-    "@jupyter-widgets/base-manager": "^1.0.8",
-    "@jupyter-widgets/controls": "^5.0.8",
+    "@jupyter-widgets/base": "^6.0.8",
+    "@jupyter-widgets/base-manager": "^1.0.9",
+    "@jupyter-widgets/controls": "^5.0.9",
     "codemirror": "^5.48.0",
     "font-awesome": "^4.7.0"
   },
diff --git a/examples/web3/package.json b/examples/web3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/example-web3",
-  "version": "8.0.10",
+  "version": "8.0.11",
   "private": true,
   "description": "Project that tests the ability to npm install jupyter-js-widgets within an npm project.",
   "license": "BSD-3-Clause",
@@ -14,9 +14,9 @@
     "test:default": "echo \"No test specified\""
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.7",
-    "@jupyter-widgets/controls": "^5.0.8",
-    "@jupyter-widgets/html-manager": "^1.0.10",
+    "@jupyter-widgets/base": "^6.0.8",
+    "@jupyter-widgets/controls": "^5.0.9",
+    "@jupyter-widgets/html-manager": "^1.0.11",
     "@jupyterlab/services": "^6.0.0 || ^7.0.0",
     "codemirror": "^5.48.0",
     "font-awesome": "^4.7.0",
diff --git a/examples/web4/package.json b/examples/web4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/example-web4",
-  "version": "8.0.10",
+  "version": "8.0.11",
   "private": true,
   "description": "Project that tests the ability to npm install jupyter-js-widgets within an npm project.",
   "license": "BSD-3-Clause",
@@ -13,7 +13,7 @@
     "test:default": "echo \"No test specified\""
   },
   "dependencies": {
-    "@jupyter-widgets/html-manager": "^1.0.10",
+    "@jupyter-widgets/html-manager": "^1.0.11",
     "font-awesome": "^4.7.0"
   },
   "devDependencies": {
diff --git a/packages/base-manager/package.json b/packages/base-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/base-manager",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Jupyter interactive widgets - base manager",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
     "test:unit:ie": "npm run test:unit:default -- --browsers=IE"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.7",
+    "@jupyter-widgets/base": "^6.0.8",
     "@jupyterlab/services": "^6.0.0 || ^7.0.0",
     "@lumino/coreutils": "^1.11.1 || ^2",
     "base64-js": "^1.2.1",
diff --git a/packages/base/package.json b/packages/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/base",
-  "version": "6.0.7",
+  "version": "6.0.8",
   "description": "Jupyter interactive widgets",
   "repository": {
     "type": "git",
diff --git a/packages/base/src/widget.ts b/packages/base/src/widget.ts
@@ -87,6 +87,7 @@ export function pack_models(
     for (const [key, sub_value] of Object.entries(value)) {
       packed[key] = pack_models(sub_value, widget);
     }
+    return packed;
   } else {
     return value;
   }
diff --git a/packages/controls/package.json b/packages/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/controls",
-  "version": "5.0.8",
+  "version": "5.0.9",
   "description": "Jupyter interactive widgets",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "test:unit:ie": "npm run test:unit:default -- --browsers=IE"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.7",
+    "@jupyter-widgets/base": "^6.0.8",
     "@lumino/algorithm": "^1.9.1 || ^2.1",
     "@lumino/domutils": "^1.8.1 || ^2.1",
     "@lumino/messaging": "^1.10.1 || ^2.1",
diff --git a/packages/html-manager/package.json b/packages/html-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/html-manager",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Standalone package for rendering Jupyter widgets outside notebooks",
   "homepage": "https://github.com/jupyter-widgets/ipywidgets#readme",
   "bugs": {
@@ -36,11 +36,11 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.12.0",
-    "@jupyter-widgets/base": "^6.0.7",
-    "@jupyter-widgets/base-manager": "^1.0.8",
-    "@jupyter-widgets/controls": "^5.0.8",
-    "@jupyter-widgets/output": "^6.0.7",
-    "@jupyter-widgets/schema": "^0.5.4",
+    "@jupyter-widgets/base": "^6.0.8",
+    "@jupyter-widgets/base-manager": "^1.0.9",
+    "@jupyter-widgets/controls": "^5.0.9",
+    "@jupyter-widgets/output": "^6.0.8",
+    "@jupyter-widgets/schema": "^0.5.5",
     "@jupyterlab/outputarea": "^3.0.0 || ^4.0.0",
     "@jupyterlab/rendermime": "^3.0.0 || ^4.0.0",
     "@jupyterlab/rendermime-interfaces": "^3.0.0 || ^4.0.0",
diff --git a/packages/output/package.json b/packages/output/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/output",
-  "version": "6.0.7",
+  "version": "6.0.8",
   "description": "Jupyter widget wrapping cell output",
   "bugs": {
     "url": "https://github.com/jupyter-widgets/ipywidgets/issues"
@@ -25,7 +25,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.7"
+    "@jupyter-widgets/base": "^6.0.8"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/schema",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Schemas for the Jupyter interactive Widgets",
   "keywords": [
     "jupyter",
diff --git a/python/ipywidgets/ipywidgets/_version.py b/python/ipywidgets/ipywidgets/_version.py
@@ -1,7 +1,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-__version__ = '8.1.2'
+__version__ = '8.1.3'
 
 __protocol_version__ = '2.1.0'
 __control_protocol_version__ = '1.0.0'
diff --git a/python/ipywidgets/setup.cfg b/python/ipywidgets/setup.cfg
@@ -37,8 +37,8 @@ install_requires =
   comm>=0.1.3
   ipython>=6.1.0
   traitlets>=4.3.1
-  widgetsnbextension~=4.0.10
-  jupyterlab_widgets~=3.0.10
+  widgetsnbextension~=4.0.11
+  jupyterlab_widgets~=3.0.11
 
 [options.extras_require]
 test =
diff --git a/python/jupyterlab_widgets/jupyterlab_widgets/_version.py b/python/jupyterlab_widgets/jupyterlab_widgets/_version.py
@@ -1,4 +1,4 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-__version__ = '3.0.10'
+__version__ = '3.0.11'
diff --git a/python/jupyterlab_widgets/package.json b/python/jupyterlab_widgets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-widgets/jupyterlab-manager",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "description": "The JupyterLab extension providing Jupyter widgets.",
   "keywords": [
     "jupyter",
@@ -46,11 +46,13 @@
     "watch": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^6.0.7",
-    "@jupyter-widgets/base-manager": "^1.0.8",
-    "@jupyter-widgets/controls": "^5.0.8",
-    "@jupyter-widgets/output": "^6.0.7",
+    "@jupyter-widgets/base": "^6.0.8",
+    "@jupyter-widgets/base-manager": "^1.0.9",
+    "@jupyter-widgets/controls": "^5.0.9",
+    "@jupyter-widgets/output": "^6.0.8",
     "@jupyterlab/application": "^3.0.0 || ^4.0.0",
+    "@jupyterlab/apputils": "^3.0.0 || ^4.0.0",
+    "@jupyterlab/console": "^3.0.0 || ^4.0.0",
     "@jupyterlab/docregistry": "^3.0.0 || ^4.0.0",
     "@jupyterlab/logconsole": "^3.0.0 || ^4.0.0",
     "@jupyterlab/mainmenu": "^3.0.0 || ^4.0.0",
@@ -65,7 +67,6 @@
     "@lumino/algorithm": "^1.11.1 || ^2.0.0",
     "@lumino/coreutils": "^1.11.1 || ^2.1",
     "@lumino/disposable": "^1.10.1 || ^2.1",
-    "@lumino/properties": "^1.8.1 || ^2.1",
     "@lumino/signaling": "^1.10.1 || ^2.1",
     "@lumino/widgets": "^1.30.0 || ^2.1",
     "@types/backbone": "1.4.14",
diff --git a/python/jupyterlab_widgets/src/plugin.ts b/python/jupyterlab_widgets/src/plugin.ts
diff --git a/python/widgetsnbextension/package.json b/python/widgetsnbextension/package.json
diff --git a/python/widgetsnbextension/widgetsnbextension/_version.py b/python/widgetsnbextension/widgetsnbextension/_version.py
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`type="radio"`
`21`	`21`	`name="demo-app"`
`22`	`22`	`autocomplete="off"`
`23`		`- value="{{ pathto('try/retro/index') }}?path=Widget%20List.ipynb"`
	`23`	`+ value="{{ pathto('try/tree/index') }}?path=Widget%20List.ipynb"`
`24`	`24`	`>`
`25`	`25`	`<i class="fas fa-book"></i> Notebook`
`26`	`26`	`</label>`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ def setup(app):`
`131`	`131`	`rediraffe_redirects = {`
`132`	`132`	`"typedoc/index": "_static/typedoc/index",`
`133`	`133`	`"try/lab/index": "_static/lab/index",`
`134`		`- "try/retro/index": "_static/retro/tree/index",`
	`134`	`+ "try/tree/index": "_static/tree/index",`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`# -- html --------------------------`