JupyterLab 3 build

Signed-off-by: martinRenou <[email protected]>

Author: martinRenou

.gitignore

@@ -6,8 +6,8 @@ build/
 node_modules/
 
 # Generated Javascript
-ipympl/static/
-ipympl/staticlab/
+ipympl/nbextension/
+ipympl/labextension/
 ipympl/*.tgz
 js/*.tgz
 

.travis.yml

@@ -7,26 +7,29 @@ cache:
   directories:
     - $HOME/.npm
 before_install:
-- wget https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-linux64.tar.gz
-- mkdir geckodriver
-- tar -xzf geckodriver-v0.11.1-linux64.tar.gz -C geckodriver
-- export PATH=$PATH:$PWD/geckodriver
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start || true
+  - wget https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-linux64.tar.gz
+  - mkdir geckodriver
+  - tar -xzf geckodriver-v0.11.1-linux64.tar.gz -C geckodriver
+  - export PATH=$PATH:$PWD/geckodriver
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start || true
 install:
-- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-- bash miniconda.sh -b -p $HOME/miniconda
-- export PATH="$HOME/miniconda/bin:$PATH"
-- hash -r
-- conda config --set always_yes yes --set changeps1 no
-- conda update -q conda
-- conda info -a
-- conda install -c conda-forge nodejs=13 notebook matplotlib ipywidgets jupyterlab
-- pip install -v .
+  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+  - conda info -a
+  - conda install -c conda-forge mamba
+  - mamba install -c conda-forge nodejs=13 matplotlib
+  - mamba install jupyterlab=3 ipywidgets jupyterlab_widgets -c conda-forge/label/jupyterlab_rc -c conda-forge/label/jupyterlab_server_rc -c conda-forge/label/jupyterlab_widgets_rc -c conda-forge
+  - pip install .
 script:
-- jupyter nbextension install --py --symlink --sys-prefix ipympl
-- jupyter nbextension enable --py --sys-prefix ipympl
-- jupyter labextension list 2>&1 | grep -q jupyter-matplotlib
-- jupyter labextension install @jupyter-widgets/jupyterlab-manager
-- jupyter labextension link js
-- python -m jupyterlab.browser_check --NotebookApp.ip=127.0.0.1
+  - test -d $HOME/miniconda/share/jupyter/nbextensions/jupyter-matplotlib
+  - test -f $HOME/miniconda/share/jupyter/nbextensions/jupyter-matplotlib/extension.js
+  - test -f $HOME/miniconda/share/jupyter/nbextensions/jupyter-matplotlib/index.js
+  - test -d $HOME/miniconda/share/jupyter/labextensions/jupyter-matplotlib
+  - test -f $HOME/miniconda/share/jupyter/labextensions/jupyter-matplotlib/package.json
+  - jupyter labextension list 2>&1 | grep -q jupyter-matplotlib
+  - python -m jupyterlab.browser_check --NotebookApp.ip=127.0.0.1

MANIFEST.in

@@ -1,4 +1,5 @@
-recursive-include ipympl/static *.*
+recursive-include ipympl/nbextension *.*
+recursive-include ipympl/labextension *.*
 
 include js/*.tgz
 include js/package.json

README.md

@@ -39,48 +39,9 @@ conda install -c conda-forge ipympl
 pip install ipympl
 ```
 
-### Install the JupyterLab extension
+### Use in JupyterLab
 
-In order to install the JupyterLab extension `jupyter-matplotlib`, you will first need to install `nodejs`, you can install it with `conda` doing
-
-```bash
-conda install -c conda-forge nodejs
-```
-
-Starting from ipympl `0.5.6`, **you do not need to manually install the JupyterLab extension**, but you still need to install the JupyterLab widget manager:
-```bash
-jupyter labextension install @jupyter-widgets/jupyterlab-manager
-
-# If you already installed the @jupyter-widgets/jupyterlab-manager extension, you will still need to rebuild JupyterLab after you installed ipympl
-jupyter lab build
-```
-
-#### Install an old JupyterLab extension
-
-You will need to install the right `jupyter-matplotlib` version, according to the `ipympl` and `jupyterlab` versions you installed.
-For example, if you installed ipympl `0.5.1`, you need to install jupyter-matplotlib `0.7.0`, and this version is only compatible with JupyterLab `1`.
-
-```bash
-conda install -c conda-forge ipympl==0.5.1
-jupyter labextension install @jupyter-widgets/jupyterlab-manager [email protected]
-```
-
-Versions lookup table:
-
-
-| `ipympl` | `jupyter-matplotlib` | `JupyterLab` | `Matplotlib` |
-|----------|----------------------|--------------|--------------|
-| 0.5.8    | 0.7.4                | 1 or 2       | 3.3.1        |
-| 0.5.7    | 0.7.3                | 1 or 2       | 3.2.*        |
-| ...      | ...                  | ...          |              |
-| 0.5.3    | 0.7.2                | 1 or 2       |              |
-| 0.5.2    | 0.7.1                | 1            |              |
-| 0.5.1    | 0.7.0                | 1            |              |
-| 0.5.0    | 0.6.0                | 1            |              |
-| 0.4.0    | 0.5.0                | 1            |              |
-| 0.3.3    | 0.4.2                | 1            |              |
-| 0.3.2    | 0.4.1                | 1            |              |
-| 0.3.1    | 0.4.0                | 0 or 1       |              |
+If you want to use ipympl in JupyterLab, we recommend using JupyterLab >= 3.
 
 ### For a development installation (requires nodejs):
 

ipympl/__init__.py

@@ -4,10 +4,17 @@
 npm_pkg_name = 'jupyter-matplotlib'
 
 
+def _jupyter_labextension_paths():
+    return [{
+        'src': 'labextension',
+        'dest': npm_pkg_name
+    }]
+
+
 def _jupyter_nbextension_paths():
     return [{
         'section': 'notebook',
-        'src': 'static',
+        'src': 'nbextension',
         'dest': npm_pkg_name,
         'require': npm_pkg_name + '/extension'
     }]