Integration of all parts (#91)

* Fix new repository name

* Init lerna

* WIP multipackages

* Integrate navigator within Python package

* WIP integration of all code

* Fix build CI

* Fix packaging

* Update binder

* Ensure labextension folder exists

* Correct configuration for binder

* Fix casperjs not found

* Fix link to icon in binder

* Update READMEs

* Fix casperjs paths

* Fix infinite loop on test

* Add webpack analyzer

* Fix fontawesome treeshaking

* Fix coverall

* Apply suggestions from code review

Co-authored-by: Jeremy Tuloup <[email protected]>

* Some tweaks following review

* Fix setup.py

* Fix undone renaming

Co-authored-by: Jeremy Tuloup <[email protected]>

Author: fcollonval

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/cache@v2
         env:
           # Increase this value to reset cache
-          CACHE_NUMBER: 1
+          CACHE_NUMBER: 2
         with:
           path: ~/conda_pkgs_dir
           key: ${{ runner.os }}-conda-${{ matrix.python-version }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements_dev.txt') }}
@@ -37,7 +37,7 @@ jobs:
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         env:
           # Increase this value to reset cache
-          CACHE_NUMBER: 2
+          CACHE_NUMBER: 3
         with:
           path: |
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -61,26 +61,22 @@ jobs:
         run: |
           conda activate test_jupyter_conda
           conda install -n test_jupyter_conda --file requirements_dev.txt
-          conda install -n test_jupyter_conda coveralls jupyterlab~=2.0
-          npm install
+          conda install -n test_jupyter_conda coveralls jupyterlab=2
+          yarn install
           npm install -g casperjs
           pip install .
-          cd labextension
-          jlpm install
-          jupyter labextension install .
-          cd ..
+          jupyter labextension link packages/common/ packages/labextension/
         shell: bash -l {0}
 
       - name: Test the extension
         run: |
           conda activate test_jupyter_conda
           flake8 setup.py jupyter_conda
           coverage run -m pytest jupyter_conda
-          coverage report 
-          cd labextension 
-          npm run eslint:check
-          npm run test
-          cd ..
+          coverage report
+          yarn run eslint:check
+          yarn run test
+
           jupyter serverextension list 1>serverextensions 2>&1
           cat serverextensions | grep "jupyter_conda.*OK"
           jupyter labextension list 1>labextensions 2>&1
@@ -100,10 +96,10 @@ jobs:
         run: |
           conda activate test_jupyter_conda
           gem install coveralls-lcov
-          cd labextension
-          coveralls-lcov -v -n coverage/lcov.info > jscoverage.json
-          cd ..
-          python -m coveralls --merge=labextension/jscoverage.json
+          cd packages/common/
+          coveralls-lcov -v -n coverage/lcov.info > ../../common-jscoverage.json
+          cd ../../
+          python -m coveralls --merge=common-jscoverage.json
         shell: bash -l {0}
 
   coveralls:
@@ -135,7 +131,7 @@ jobs:
         uses: actions/cache@v2
         env:
           # Increase this value to reset cache
-          CACHE_NUMBER: 1
+          CACHE_NUMBER: 2
         with:
           path: ~/conda_pkgs_dir
           key: ${{ matrix.os }}-conda-3.7-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements_dev.txt') }}
@@ -151,7 +147,7 @@ jobs:
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         env:
           # Increase this value to reset cache
-          CACHE_NUMBER: 1
+          CACHE_NUMBER: 2
         with:
           path: |
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -175,14 +171,13 @@ jobs:
         run: |
           conda activate test_jupyter_conda
           conda install -n test_jupyter_conda --file requirements_dev.txt
-          conda install -n test_jupyter_conda coveralls jupyterlab~=2.0
-          npm install
+          conda install -n test_jupyter_conda coveralls jupyterlab=2
+          yarn install
           npm install -g casperjs@^1.1.1 phantomjs-prebuilt@^2.1.7
           pip install .
-          cd labextension
-          jlpm install
-          jupyter labextension install .
-          cd ..
+
+          yarn install
+          jupyter labextension link packages/common/ packages/labextension/
         shell: bash -l {0}
 
       - name: Test the extension
@@ -191,12 +186,11 @@ jobs:
         run: |
           conda activate test_jupyter_conda
           flake8 setup.py jupyter_conda
-          coverage run -m pytest jupyter_conda 
-          coverage report 
-          cd labextension 
-          npm run eslint:check
-          npm run test
-          cd ..
+          coverage run -m pytest jupyter_conda
+          coverage report
+          yarn run eslint:check
+          yarn run test
+
           jupyter serverextension list
           jupyter labextension list
           if [ "${OS_RUNNER}" != "windows-latest" ]; then python -m jupyterlab.browser_check; fi
@@ -239,7 +233,7 @@ jobs:
         run: |
           conda activate test_jupyter_conda
           mamba install -n test_jupyter_conda --file requirements_dev.txt
-          npm install
+          yarn install
           npm install -g casperjs
           pip install .
         shell: bash -l {0}

.github/workflows/navigator.yml

@@ -25,10 +25,9 @@ jobs:
       - name: Build and publish NPM package
         if: ${{ startsWith(github.ref, 'refs/tags/jupyterlab_conda') }}
         run: |
-          cd labextension
-          jlpm
-          npm publish
-          cd ..
+          npm install -g yarn
+          yarn install
+          yarn run publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Publish Python package

.github/workflows/publish.yml

@@ -61,6 +61,10 @@ screenshots/
 node_modules/
 
 .vscode/
-*/tsconfig.tsbuildinfo
+**/tsconfig.tsbuildinfo
 .pytest_cache/
-labextension/coverage/
+jupyter_conda/navigator/static/**
+!jupyter_conda/navigator/static/.gitkeep
+packages/**/coverage/**
+jupyter_conda/labextension/**
+packages/navigator/webpack-report.html

.gitignore

@@ -1,18 +1,21 @@
 include LICENSE
 include README.md
-include setup.py
-include requirements.txt
 include requirements_dev.txt
 
 recursive-include jupyter-config *.json
 recursive-include jupyter_conda *
 
 include package.json
-graft labextension
-prune labextension/coverage
-prune labextension/lib
-prune labextension/build
-prune labextension/node_modules
+include lerna.json
+include yarn.lock
+include tsconfig.json
+include tsconfig-base.json
+include eslint-base.js
+graft packages
+prune packages/**/coverage
+prune packages/**/lib
+prune packages/**/build
+prune packages/**/node_modules
 prune **/.ipynb_checkpoints
 prune **/.vscode
 
@@ -22,4 +25,4 @@ global-exclude *.pyc
 global-exclude *.pyo
 global-exclude *.gif
 global-exclude *.tsbuildinfo
-global-exclude *.log
+global-exclude *.log