JupyterLab 3 update

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

.github/workflows/test.yml

@@ -36,7 +36,7 @@ jobs:
       id: pip-cache
       run: |
         echo "::set-output name=dir::$(pip cache dir)"
-  
+
     - name: pip cache
       uses: actions/cache@v2
       with:
@@ -46,22 +46,21 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}-
           ${{ runner.os }}-pip-
 
+    - name: Install build dependencies
+      shell: bash -l {0}
+      run: pip install jupyterlab==3 jupyter-packaging
+
     - name: Install ipycytoscape
       shell: bash -l {0}
       run: pip install -e ".[test, examples]"
 
-    # For build speed only means using one of the runs for the long step
-    # Nothing is special about 3.7. That should be bumped when the python
-    # versions that are tested are bumped.
-    - name: Install labextension (Only on 3.7 for build speed)
-      if: matrix.python-version == 3.7
+    - name: Check labextension
       shell: bash -l {0}
       run: |
-        jupyter labextension install . 
         jupyter labextension list 1>labextensions 2>&1
         cat labextensions | grep "jupyter-cytoscape.*OK"
         python -m jupyterlab.browser_check
-        
+
     - name: Run Tests
       shell: bash -l {0}
       run: pytest . --color=yes

.gitignore

@@ -145,8 +145,8 @@ $RECYCLE.BIN/
 # ----
 
 **/node_modules/
-ipycytoscape/nbextension/static/index.*
-ipycytoscape/labextension/*.tgz
+ipycytoscape/nbextension/static/*
+ipycytoscape/labextension/*
 
 # Coverage data
 # -------------

MANIFEST.in

@@ -2,13 +2,16 @@ include LICENSE
 include README.md
 
 include setupbase.py
+include pyproject.toml
 include pytest.ini
 include .coverage.rc
 
 include tsconfig.json
 include package.json
 include webpack.config.js
-include ipycytoscape/labextension/*.tgz
+
+recursive-include ipycytoscape/nbextension/*
+recursive-include ipycytoscape/labextension/*
 
 # Documentation
 graft docs
@@ -25,7 +28,6 @@ graft tests
 prune tests/build
 
 # Javascript files
-graft ipycytoscape/nbextension
 graft src
 graft css
 prune **/node_modules
@@ -38,3 +40,4 @@ global-exclude *.pyc
 global-exclude *.pyo
 global-exclude .git
 global-exclude .ipynb_checkpoints
+

appveyor.yml

@@ -34,7 +34,7 @@ install:
   - 'conda create -n test_env python=%PYTHON_VERSION% -y'
   - 'activate test_env'
   # Update install tools:
-  - 'conda install setuptools pip -y'
+  - 'conda install setuptools pip jupyterlab=3 jupyter-packaging -c conda-forge -y'
   - 'python -m pip install --upgrade pip'
   - 'python -m easy_install --upgrade setuptools'
   # Install coverage utilities:

environment.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - ipycytoscape>=1.0.3
-  - jupyterlab=2
+  - jupyterlab=3
   - matplotlib-base
   - networkx
   - pandas