Fix CI

.eslintrc.js

@@ -2,9 +2,7 @@ module.exports = {
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
-    'prettier'
+    'plugin:@typescript-eslint/recommended'
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {

.github/workflows/build.yml

@@ -24,15 +24,7 @@ jobs:
           extra-specs: |
             python=3.9
             jupyterlab=4
-            freecad
-
-      - name: Lint the extension
-        shell: bash -l {0}
-        run: |
-          set -eux
-          jlpm
-          export NODE_OPTIONS="--max-old-space-size=4096"
-          jlpm run lint:check
+            yarn=3
 
       - name: Setup pip cache
         uses: actions/cache@v2
@@ -70,6 +62,7 @@ jobs:
         shell: bash -l {0}
         run: |
           set -eux
+          yarn install
           yarn dev
           jupyter labextension list 2>&1 | grep -ie "jupytercad-core.*OK"
           jupyter labextension list 2>&1 | grep -ie "jupytercad-lab.*OK"
@@ -100,9 +93,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
       - name: Install Python
         uses: actions/setup-python@v4
         with:
@@ -120,10 +110,13 @@ jobs:
           # Remove NodeJS, twice to take care of system and locally installed node versions.
           sudo rm -rf $(which node)
           sudo rm -rf $(which node)
-          pip install "jupyterlab>=4.0.0" jupytercad*.whl
+
+          cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl .
+          python -m pip install "jupyterlab>=4.0.0" jupytercad*.whl
 
           jupyter labextension list
           jupyter labextension list 2>&1 | grep -ie "jupytercad.*OK"
+          jupyter cad --version
           # jupyterlab.browser_check will fail due to the core extension jupyterlab_pygments.
           # It does not support lab v4.0.0
           #python -m jupyterlab.browser_check --no-chrome-test
@@ -149,7 +142,6 @@ jobs:
           extra-specs: |
             python=3.9
             jupyterlab=4
-            freecad
             pythonocc-core
 
       - name: Download extension package
@@ -161,6 +153,7 @@ jobs:
         shell: bash -l {0}
         run: |
           set -eux
+          cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl .
           python -m pip install jupytercad*.whl
 
       - name: Install dependencies

.github/workflows/check-release.yml

@@ -11,12 +11,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Base Setup
-        uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
-      - name: Install Dependencies
-        run: |
-          pip install "jupyterlab>=4.0.0,<5"
-          yarn dev
+
+      - name: Install Conda environment with Micromamba
+        uses: mamba-org/provision-with-micromamba@main
+        with:
+          environment-name: cad
+          environment-file: false
+          channels: conda-forge/label/jupyterlab_beta,conda-forge
+          extra-specs: |
+            python=3.9
+            jupyterlab=4
+            yarn=3
+
       - name: Check Release
         uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
         with:

.github/workflows/update_galata_references.yaml

@@ -48,14 +48,14 @@ jobs:
 
       - name: Create the conda environment
         shell: bash -l {0}
-        run: mamba install -q python=3.9 pip freecad jupyterlab=4.0.0 pythonocc-core
+        run: mamba install -q python=3.9 pip freecad jupyterlab=4 pythonocc-core
 
       - name: Install the extension
         shell: bash -l {0}
         run: |
           whereis python
+          cp ./jupytercad-core/dist/jupytercad*.whl ./jupytercad-lab/dist/jupytercad*.whl ./jupytercad-app/dist/jupytercad*.whl .
           python -m pip install jupytercad*.whl
-          python -m pip install jupyter_collaboration==1.0.0a9
 
       - name: Install dependencies
         shell: bash -l {0}

.pre-commit-config.yaml

@@ -51,5 +51,3 @@ repos:
           - 'eslint@8.36.0'
           - '@typescript-eslint/eslint-plugin@5.55.0'
           - '@typescript-eslint/parser@5.55.0'
-          - 'eslint-plugin-prettier@5.0.1'
-          - 'eslint-config-prettier@8.7.0'

.prettierignore

@@ -1,7 +1,6 @@
 node_modules
 **/node_modules
 **/lib
-**/package.json
 jupytercad
 **/*.d.ts
 **/*.js

.readthedocs.yaml

@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: "ubuntu-20.04"
+  os: 'ubuntu-20.04'
   tools:
-    python: "mambaforge-4.10"
+    python: 'mambaforge-4.10'
 
 conda:
   environment: docs/environment.yml

docs/environment.yml

@@ -7,4 +7,4 @@ dependencies:
   - pydata-sphinx-theme
   - sphinx-autodoc-typehints
   - pip:
-    - jupytercad
+      - jupytercad