Merge pull request #174 from martinRenou/yarn

Use yarn, and fix JupyterLab 2 support

Author: martinRenou

.github/workflows/main.yml

@@ -8,15 +8,19 @@ on:
     branches:
     - master
 
+defaults:
+  run:
+    shell: bash -l {0}
+
 jobs:
   run:
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        python-version: [3.7, 3.8]
+        os: [ubuntu-latest]
+        python-version: [3.8]
 
     steps:
     - name: Checkout
@@ -25,19 +29,17 @@ jobs:
     - name: Setup conda
       uses: conda-incubator/setup-miniconda@v2
       with:
+        activate-environment: ipycanvas-dev
+        environment-file: dev-environment.yml
+        python-version: ${{ matrix.python-version }}
         mamba-version: "*"
+        auto-activate-base: false
         channels: conda-forge
 
-    - name: Mamba install dependencies
-      shell: bash -l {0}
-      run: mamba install python=${{ matrix.python-version }} pip nodejs ipywidgets=7.6 jupyter jupyterlab=3 pillow numpy flake8
-
     - name: Install ipycanvas
-      shell: bash -l {0}
       run: pip install -e .
 
     - name: Check installation files
-      shell: bash -l {0}
       run: |
         test -d $CONDA_PREFIX/share/jupyter/nbextensions/ipycanvas
         test -f $CONDA_PREFIX/share/jupyter/nbextensions/ipycanvas/extension.js
@@ -46,11 +48,100 @@ jobs:
         test -f $CONDA_PREFIX/share/jupyter/labextensions/ipycanvas/package.json
 
     - name: Check nbextension and labextension
-      shell: bash -l {0}
       run: |
         jupyter nbextension list 2>&1 | grep -ie "ipycanvas/extension.*enabled" -
         jupyter labextension list 2>&1 | grep -ie "ipycanvas.*enabled.*ok" -
 
     - name: Test flake8
-      shell: bash -l {0}
       run: flake8 ipycanvas --ignore=E501,W504,W503
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup conda
+      uses: conda-incubator/setup-miniconda@v2
+      with:
+        activate-environment: ipycanvas-dev
+        environment-file: dev-environment.yml
+        python-version: ${{ matrix.python-version }}
+        mamba-version: "*"
+        auto-activate-base: false
+        channels: conda-forge
+
+    - name: Build packages
+      run: |
+        python setup.py sdist bdist_wheel
+        cd dist
+        sha256sum * | tee SHA256SUMS
+
+    - name: Upload builds
+      uses: actions/upload-artifact@v2
+      with:
+        name: dist ${{ github.run_number }}
+        path: ./dist
+
+  install:
+    runs-on: ${{ matrix.os }}-latest
+    needs: [build]
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, macos]
+        python: ['3.6', '3.9']
+        include:
+          - python: '3.6'
+            dist: 'ipycanvas*.tar.gz'
+            jlab_version: 3
+          - python: '3.9'
+            dist: 'ipycanvas*.whl'
+            jlab_version: 2
+
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup conda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          mamba-version: "*"
+          auto-activate-base: false
+          channels: conda-forge
+
+      - name: Install dependencies
+        run: mamba install python=${{ matrix.python-version }} pip yarn jupyterlab=${{ matrix.jlab_version }} ipywidgets jupyter-packaging
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: dist ${{ github.run_number }}
+          path: ./dist
+
+      - name: Install the package
+        run: |
+          cd dist
+          pip install -vv ${{ matrix.dist }}
+
+      - name: Manually install labextension for lab2
+        if: ${{ matrix.jlab_version }} == 2
+        run: jupyter labextension install .
+
+      - name: Test installation files
+        run: |
+          test -d $CONDA_PREFIX/share/jupyter/nbextensions/ipycanvas
+          test -f $CONDA_PREFIX/share/jupyter/nbextensions/ipycanvas/extension.js
+          test -f $CONDA_PREFIX/share/jupyter/nbextensions/ipycanvas/index.js
+          test -d $CONDA_PREFIX/share/jupyter/labextensions/ipycanvas
+          test -f $CONDA_PREFIX/share/jupyter/labextensions/ipycanvas/package.json
+          test -d $CONDA_PREFIX/share/jupyter/labextensions/ipycanvas/static
+
+      - name: Validate the nbextension
+        run: jupyter nbextension list 2>&1 | grep "ipycanvas/extension"
+
+      - name: Validate the labextension
+        run: jupyter labextension list 2>&1 | grep ipycanvas

.gitignore

@@ -7,6 +7,7 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+MANIFEST
 .Python
 env/
 build/

README.md

@@ -40,7 +40,7 @@ conda install -c conda-forge ipycanvas
 And if you use jupyterlab <= 2:
 
 ```bash
-conda install -c conda-forge nodejs
+conda install -c conda-forge yarn
 jupyter labextension install @jupyter-widgets/jupyterlab-manager ipycanvas
 ```
 

dev-environment.yml

@@ -0,0 +1,10 @@
+name: ipycanvas-dev
+channels:
+    - conda-forge
+dependencies:
+    - pip
+    - yarn
+    - jupyter-packaging
+    - jupyterlab=3
+    - ipywidgets>=7.6
+    - flake8