Merge branch 'master' into borders3

Author: Zerline

.github/workflows/lint.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Use Node.js 10.x
       uses: actions/setup-node@v1
       with:

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Use Node.js 10.x
       uses: actions/setup-node@v1
       with:
@@ -87,7 +87,7 @@ jobs:
         python-version: [3.5, 3.6, 3.7, 3.8]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
@@ -110,7 +110,7 @@ jobs:
     name: Message Specification
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python
       uses: actions/setup-python@v1
       with:

MANIFEST.in

@@ -2,19 +2,18 @@ include LICENSE
 include CONTRIBUTING.md
 include README.md
 include package.json
-include bower.json
-include .bowerrc
-include ipywidgets/build_css.js
 
 # Documentation
 graft docs
 exclude docs/\#*
 
-# Examples
+# Tests
 graft ipywidgets/tests
+
+# Static Assets
 graft ipywidgets/static
 
-# docs subdirs we want to skip
+# Docs subdirs we want to skip
 prune docs/build
 prune docs/dist
 

README.md

@@ -1,13 +1,13 @@
 # ipywidgets: Interactive HTML Widgets
 
 [![Version](https://img.shields.io/pypi/v/ipywidgets.svg)](https://pypi.python.org/pypi/ipywidgets)
-[![Build Status](https://travis-ci.org/jupyter-widgets/ipywidgets.svg?branch=master)](https://travis-ci.org/jupyter-widgets/ipywidgets)
+![Build Status](https://img.shields.io/github/workflow/status/jupyter-widgets/ipywidgets/Test/master)
 [![Documentation Status](http://readthedocs.org/projects/ipywidgets/badge/?version=stable)](https://ipywidgets.readthedocs.io/)
 [![Join the chat at https://gitter.im/ipython/ipywidgets](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jupyter-widgets/Lobby)
 [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/jupyter-widgets/ipywidgets/master?filepath=docs%2Fsource%2Fexamples)
 
 ipywidgets are [interactive HTML widgets](https://github.com/jupyter-widgets/ipywidgets/blob/master/docs/source/examples/Index.ipynb)
-for Jupyter notebooks and the IPython kernel.
+for Jupyter notebooks, JupyterLab and the IPython kernel.
 
 Notebooks come alive when interactive widgets are used. Users gain control of
 their data and can visualize changes in the data.
@@ -78,6 +78,13 @@ jupyter nbextension enable --py --sys-prefix widgetsnbextension  # can be skippe
 conda install -c conda-forge ipywidgets
 ```
 
+- Add ipywidgets to JupyterLab after installing with pip or conda (note that this requires nodejs to be installed and that the package name is different):
+
+
+```
+jupyter labextension install @jupyter-widgets/jupyterlab-manager
+```
+
 See the [Installation](docs/source/user_install.md) section of the documentation for additional details.
 
 ### Installing from git

docs/source/dev_docs.md

@@ -4,25 +4,36 @@ Building the Documentation
 To build the documentation you'll need [Sphinx](http://www.sphinx-doc.org/), [pandoc](http://pandoc.org/)
 and a few other packages.
 
-To install (and activate) a [conda environment](http://conda.pydata.org/docs/using/envs.html#use-environment-from-file) named `notebook_docs`
-containing all the necessary packages (except pandoc), use:
+First create a [conda environment](http://conda.pydata.org/docs/using/envs.html#use-environment-from-file) named `ipywidgets_docs` to install all the necessary packages:
 
+```bash
+# create the environment
+conda create -n ipywidgets_docs -c conda-forge python pip
+
+# activate the environment
+conda activate ipywidgets_docs   # Linux and OS X
+activate ipywidgets_docs         # Windows
 ```
-conda env create -f docs/environment.yml
-source activate ipywidget_docs  # Linux and OS X
-activate ipywidget_docs         # Windows
-```
 
-If you want to install the necessary packages with `pip` instead, use
-(omitting `--user` if working in a virtual environment):
+Alternatively, it is also possible to create a virtual environment and activate it with the following commands:
+
+```bash
+# create the environment
+python -m venv .
 
+# activate the environment
+source bin/activate
 ```
-pip install -r docs/requirements.txt --user
+
+In the environment, install the packages:
+
+```bash
+python -m pip install -r docs/requirements.txt
 ```
 
 Once you have installed the required packages, you can build the docs with:
 
-```
+```bash
 cd docs
 make clean
 make html
@@ -31,12 +42,6 @@ make html
 After that, the generated HTML files will be available at
 `build/html/index.html`. You may view the docs in your browser.
 
-You can automatically check if all hyperlinks are still valid::
-
-```
-make linkcheck
-```
-
 Windows users can find `make.bat` in the `docs` folder.
 
 You should also have a look at the [Project Jupyter Documentation Guide](https://jupyter.readthedocs.io/en/latest/contrib_docs/index.html).

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,17 +48,19 @@ 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
 
 Go into the `widgetsnbextension` directory. Change `widgetsnbextension/_version.py` to reflect the new version number.
 ```
 python setup.py sdist
-python setup.py bdist_wheel --universal
+python setup.py bdist_wheel
 twine upload dist/*
 ```
 
@@ -72,7 +75,7 @@ Change `ipywidgets/_version.py` to reflect the new version number, and if necess
 
 ```
 python setup.py sdist
-python setup.py bdist_wheel --universal
+python setup.py bdist_wheel
 twine upload dist/*
 ```
 

docs/source/embedding.md

@@ -51,7 +51,7 @@ This HTML snippet is composed of multiple `<script>` tags embedded into an HTML
 
 - Then there are a number of script tags, each with mime type
   `application/vnd.jupyter.widget-view+json`, corresponding to the views which
-  you want to display in the web page. These script tags must be in the body of
+  you want to display on the web page. These script tags must be in the body of
   the page, and are replaced with the rendered widgets. The JSON schema for the
   content of these script tags is found in the `@jupyter-widgets/schema` npm
   package.
@@ -73,7 +73,7 @@ the `application/vnd.jupyter.widget-state+json` format specified in the
 
 Embeddable code for the widgets can also be produced from Python. The
 `ipywidgets.embed` module provides several functions for embedding widgets
-into HTML documents programatically.
+into HTML documents programmatically.
 
 Use `embed_minimal_html` to create a simple, stand-alone HTML page:
 
@@ -124,6 +124,7 @@ html_template = """
     <!-- Load IPywidgets bundle for embedding. -->
     <script
       data-jupyter-widgets-cdn="https://cdn.jsdelivr.net/npm/"
+      data-jupyter-widgets-cdn-only
       src="https://unpkg.com/@jupyter-widgets/html-manager@*/dist/embed-amd.js" 
       crossorigin="anonymous">
     </script>
@@ -181,6 +182,9 @@ documents, you may want to use a templating engine like
 We also change the CDN from its default of unpkg to use jsdelivr by setting the
 `data-jupyter-widgets-cdn` attribute.
 
+What's more, we only load modules from the CDN by setting the
+`data-jupyter-widgets-cdn-only` attribute.
+
 In all embedding functions in `ipywidgets.embed`, the state of all widgets
 known to the widget manager is included by default. You can alternatively
 pass a reduced state to use instead. This can be particularly relevant if you
@@ -270,6 +274,11 @@ While the default CDN is using https://unpkg.com it can be configured by
 setting the optional `data-jupyter-widgets-cdn` attribute for script tag which loads `embed-amd.js`,
 as shown in the example above.
 
+While the default strategy is loading modules from the same site, and then
+falling back to CDN. This can be configured by setting the optional
+`data-jupyter-widgets-cdn-only` attribute for script tag which loads `embed-amd.js`
+as shown in the example above too.
+
 The [widget-cookiecutter](https://github.com/jupyter/widget-cookiecutter)
 template project contains a template project for a custom widget library
 following the best practices for authoring widgets, which ensure that your

docs/source/examples/Layout Example.ipynb

@@ -316,4 +316,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}

docs/source/examples/Layout Templates.ipynb

@@ -6,7 +6,7 @@
    "source": [
     "# Using Layout Templates\n",
     "\n",
-    "As we showed in [Layout and Styling of Jupyter widgets](Widget%20Styling.ipynb) multiple widgets can be aranged together using the flexible [GridBox](Widget%20Styling.ipynb#The-Grid-Layout) specification. However, use of the specification involves some understanding of CSS properties and may impose sharp learning curve. Here, we will describe layout templates built on top of `GridBox` that simplify creation of common widget layouts."
+    "As we showed in [Layout and Styling of Jupyter widgets](Widget%20Styling.ipynb) multiple widgets can be arranged together using the flexible [GridBox](Widget%20Styling.ipynb#The-Grid-Layout) specification. However, use of the specification involves some understanding of CSS properties and may impose sharp learning curve. Here, we will describe layout templates built on top of `GridBox` that simplify creation of common widget layouts."
    ]
   },
   {
@@ -43,7 +43,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "You can easily create a layout with 4 widgets aranged on 2x2 matrix using the `TwoByTwoLayout` widget: "
+    "You can easily create a layout with 4 widgets arranged on 2x2 matrix using the `TwoByTwoLayout` widget: "
    ]
   },
   {
@@ -536,7 +536,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this examples, we will demonstrate how to use `GridspecLayout` and `bqplot` widget to create a multipanel scatter plot. To run this example you will need to install the [bqplot](https://bqplot.readthedocs.io/en/latest/) package."
+    "In these examples, we will demonstrate how to use `GridspecLayout` and `bqplot` widget to create a multipanel scatter plot. To run this example you will need to install the [bqplot](https://bqplot.readthedocs.io/en/latest/) package."
    ]
   },
   {
@@ -715,4 +715,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}