Upgrade to JupyterLab by reinitializing project structure

Author: philippjfr

MANIFEST.in

@@ -1,4 +1,26 @@
+include LICENSE
 include README.md
-include LICENSE.txt
-include jupyter_bokeh.json
+include pyproject.toml
+include jupyter-config/jupyter_bokeh.json
+
+include package.json
+include install.json
+include ts*.json
+include yarn.lock
+
 recursive-include jupyter_bokeh/nbextension/static *.js *.js.map *.d.ts
+
+graft jupyter_bokeh/labextension
+
+# Javascript files
+graft src
+graft style
+prune **/node_modules
+prune lib
+
+# Patterns to exclude from any directory
+global-exclude *~
+global-exclude *.pyc
+global-exclude *.pyo
+global-exclude .git
+global-exclude .ipynb_checkpoints

README.md

@@ -1,36 +1,37 @@
 # jupyter_bokeh
 
-A Jupyter extension for rendering [Bokeh](https://bokeh.org) content within Jupyter.  See also the separate [ipywidgets_bokeh](https://github.com/bokeh/ipywidgets_bokeh) library for support for using Jupyter widgets/ipywidgets objects within Bokeh applications.
+![Github Actions Status](https://github.com/bokeh/jupyter_bokeh/workflows/Build/badge.svg)
 
-## Prerequisites
+A Jupyter extension for rendering [Bokeh](https://bokeh.org) content within Jupyter.  See also the separate [ipywidgets_bokeh](https://github.com/bokeh/ipywidgets_bokeh) library for support for using Jupyter widgets/ipywidgets objects within Bokeh applications.
 
-* Jupyter Lab or Notebook
 
-## Installation
+## Install
 
 To install the latest version in Jupyter Lab:
 
 ```bash
+pip install jupyter_bokeh
+```
+
+or
+
+```
 conda install -c bokeh jupyter_bokeh
-jupyter labextension install @jupyter-widgets/jupyterlab-manager
-jupyter labextension install @bokeh/jupyter_bokeh
 ```
 
-To install a specific version:
+For versions of Jupyter Lab <3.0 you must install the labextension
+separately:
 
 ```bash
-jupyter labextension install @bokeh/[email protected]
+conda install -c bokeh jupyter_bokeh
+jupyter labextension install @jupyter-widgets/jupyterlab-manager
+jupyter labextension install @bokeh/jupyter_bokeh
 ```
 
-On slow or limited memory systems, one can use `--minimize=False` to reduce compilation
-times or make Jupyter Lab build runtime bundles at all.
-
-jupyter_bokeh is automatically installed in Jupyter Notebook. In case of a non-standard
-setup, one can install the extensions with:
+To install a specific version:
 
 ```bash
-jupyter nbextension install --sys-prefix --symlink --py jupyter_bokeh
-jupyter nbextension enable jupyter_bokeh --py --sys-prefix
+jupyter labextension install @bokeh/[email protected]
 ```
 
 ## Compatibility
@@ -53,41 +54,48 @@ installation may refer to the below table.
 | 0.35.x        | 0.6.3            |
 | 1.0.x         | 1.0.0            |
 | 2.0.x         | 2.0.0            |
+| 3.0.x         | 3.0.0            |
 
-## Development
+## Contributing
 
-For a development install (requires npm version 6 or later), do the following in the repository directory:
+### Development install
 
-```bash
-npm install
-jupyter labextension link .
-```
+Note: You will need NodeJS to build the extension package.
 
-To rebuild the package and the JupyterLab app:
+The `jlpm` command is JupyterLab's pinned version of
+[yarn](https://yarnpkg.com/) that is installed with JupyterLab. You may use
+`yarn` or `npm` in lieu of `jlpm` below.
 
 ```bash
-npm run build
-jupyter lab build
+# Clone the repo to your local environment
+# Change directory to the jupyter_bokeh directory
+# Install package in development mode
+pip install -e .
+# Link your development version of the extension with JupyterLab
+jupyter labextension develop . --overwrite
+# Rebuild extension Typescript source after making changes
+jlpm run build
 ```
 
-To incrementally rebuild the extension and JupyterLab after changes you can run
+You can watch the source directory and run JupyterLab at the same time in different terminals to watch for changes in the extension's source and automatically rebuild the extension.
 
 ```bash
-npm run watch
+# Watch the source directory in one terminal, automatically rebuilding when needed
+jlpm run watch
+# Run JupyterLab in another terminal
+jupyter lab
 ```
 
-and in another terminal run
+With the watch command running, every saved change will immediately be built locally and available in your running JupyterLab. Refresh JupyterLab to load the change in your browser (you may need to wait several seconds for the extension to be rebuilt).
+
+By default, the `jlpm run build` command generates the source maps for this extension to make it easier to debug using the browser dev tools. To also generate source maps for the JupyterLab core extensions, you can run the following command:
 
 ```bash
-jupyter lab --watch
+jupyter lab build --minimize=False
 ```
 
-When making a new release for compatibility with a new JupyterLab minor release series, please make a minor
-release bump in this extension (i.e. 0.6.3 -> 0.7.0). Conversely, when creating a release for a new feature or bug fix,
-please make a micro release bump (i.e. 0.6.3 -> 0.6.4).
-
-## Testing
+### Uninstall
 
-There is a directory named ``examples`` which contains a collection of notebooks that cover the various ``jupyter_bokeh``
-functionalities. If you update the extension for new JupyterLab releases, please manually execute each and check that the
-expected behavior occurs. If you extend the ``jupyter_bokeh``, please add a new notebook that covers the new functionality.
+```bash
+pip uninstall jupyter_bokeh
+```

eslint.json

@@ -0,0 +1,5 @@
+{
+  "packageManager": "python",
+  "packageName": "jupyter_bokeh",
+  "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyter_bokeh"
+}

install.json

@@ -1,5 +1,17 @@
+import json
+
+from pathlib import Path
+
 from .nbextension import _jupyter_nbextension_paths
+from ._version import __version__
+
+HERE = Path(__file__).parent.resolve()
 
-from .widgets import BokehModel
+with (HERE / "labextension" / "package.json").open() as fid:
+    data = json.load(fid)
 
-__version__ = "2.0.4"
+def _jupyter_labextension_paths():
+    return [{
+        "src": "labextension",
+        "dest": data["name"]
+    }]

jupyter_bokeh/__init__.py

@@ -0,0 +1,19 @@
+import json
+from pathlib import Path
+
+__all__ = ["__version__"]
+
+def _fetchVersion():
+    HERE = Path(__file__).parent.resolve()
+
+    for settings in HERE.rglob("package.json"): 
+        try:
+            with settings.open() as f:
+                return json.load(f)["version"]
+        except FileNotFoundError:
+            pass
+
+    raise FileNotFoundError(f"Could not find package.json under dir {HERE!s}")
+
+__version__ = _fetchVersion()
+

jupyter_bokeh/_version.py

@@ -1,2 +0,0 @@
-/index.js
-/index.js.map

jupyter_bokeh/nbextension/static/.gitignore

@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# Copyright (c) 2012 - 2020, Anaconda, Inc., and Bokeh Contributors.
+# Copyright (c) 2012 - 2021, Anaconda, Inc., and Bokeh Contributors.
 # All rights reserved.
 #
 # The full license is in the file LICENSE.txt, distributed with this software.
@@ -31,6 +31,8 @@
 from bokeh.protocol import Protocol
 from bokeh.util.dependencies import import_optional
 
+from ._version import __version__
+
 #-----------------------------------------------------------------------------
 # Globals and constants
 #-----------------------------------------------------------------------------
@@ -40,7 +42,7 @@
 )
 
 _module_name = "@bokeh/jupyter_bokeh"
-_module_version = "^2.0.4"
+_module_version = "^" + str(__version__)
 
 #-----------------------------------------------------------------------------
 # General API