Merge pull request #1057 from krassowski/lab-41-cont

Build against JupyterLab 4.1, fix tests
jupyter-lsp · Feb 25, 2024 · 376c996 · 376c996
2 parents 5afe3b4 + e8de5d1
commit 376c996
Show file tree

Hide file tree

Showing 146 changed files with 5,520 additions and 4,033 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -41,8 +41,7 @@ https://jupyterlab.readthedocs.io/en/latest/getting_started/issue.html
 
 <details><summary>Required: installed server extensions</summary>
 <pre>
-Paste the output from running `jupyter server extension list` (JupyterLab >= 3)
-or `jupyter serverextension list` (JupyterLab < 3) from the command line here.
+Paste the output from running `jupyter server extension list` from the command line here.
 You may want to sanitize the paths in the output.
 </pre>
 </details>

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml
@@ -43,11 +43,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu]
-        nodejs: ['>=16,<17.0.0a0']
-        lab: ['>=4.0.6,<5.0.0a0']
+        nodejs: ['>=20,<21']
+        lab: ['>=4.1.0,<5.0.0a0']
         r: ['>=4']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: cschleiden/replace-tokens@v1
         with:
@@ -59,7 +59,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Set up Python and mamba
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           environment-file: requirements/github-actions.yml
           miniforge-variant: Mambaforge
@@ -73,7 +73,7 @@ jobs:
 
       - name: Cache node_modules
         id: cache-node-modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: |
@@ -82,7 +82,7 @@ jobs:
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '.yarn/cache'
           key: |
@@ -123,11 +123,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu]
-        nodejs: ['>=16,<17.0.0a0']
-        lab: ['>=4.0.0,<5.0.0a0']
+        nodejs: ['>=20,<21']
+        lab: ['>=4.1.0,<5.0.0a0']
         r: ['>=4']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: cschleiden/replace-tokens@v1
         with:
@@ -139,7 +139,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Set up Python and mamba
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
@@ -149,7 +149,7 @@ jobs:
 
       - name: Cache node_modules
         id: cache-node-modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: |
@@ -158,7 +158,7 @@ jobs:
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '.yarn/cache'
           key: |
@@ -196,7 +196,7 @@ jobs:
           sha256sum * | tee SHA256SUMS
 
       - name: Publish builds
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jupyterlab-lsp dist ${{ github.run_number }}
           path: ./dist
@@ -220,15 +220,15 @@ jobs:
             # Node 16 end-of-life: 2023-09-11
             nodejs: '>=16,<17.0.0.a0'
             r: '>=4'
-            lab: '>=4,<5'
+            lab: '>=4.1.0,<5'
           - python: '3.11'
             # Node 18 end-of-life: 2025-04-30
             nodejs: '>=18,<19.0.0.a0'
             r: '>=4'
-            lab: '>=4,<5'
+            lab: '>=4.1.0,<5'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set JupyterLab and Node versions
         uses: cschleiden/replace-tokens@v1
@@ -241,7 +241,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Set up Python and mamba
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ matrix.python }}
           environment-file: requirements/github-actions.yml
@@ -253,7 +253,7 @@ jobs:
 
       - name: Cache node_modules
         id: cache-node-modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: |
@@ -262,7 +262,7 @@ jobs:
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '.yarn/cache'
           key: |
@@ -271,13 +271,13 @@ jobs:
             ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
             ${{ env.CACHE_EPOCH }}-yarn-
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.julia/artifacts
           key: |
             ${{ env.CACHE_EPOCH }}-julia-test-${{ runner.os }}-${{ env.JULIA_LANGSERVER }}
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: jupyterlab-lsp dist ${{ github.run_number }}
           path: ./dist
@@ -322,15 +322,15 @@ jobs:
 
       - name: Find and remove empty files
         # https://github.com/actions/upload-artifact/issues/150
-        run: find ./atest/output -empty -delete
+        run: find ./build/reports -empty -delete
         if: always()
         shell: bash
 
       - name: Publish browser test output
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ job.status }} Robot ${{ matrix.os }} Python ${{ matrix.python }} ${{ github.run_number }}
-          path: ./atest/output
+          name: Robot ${{ matrix.os }} Python ${{ matrix.python }} ${{ github.run_number }}
+          path: ./build/reports
         if: always()
 
       - name: Rename uncached conda packages
@@ -350,16 +350,16 @@ jobs:
         include:
           - python: '3.8'
             dist: 'jupyter*lsp*.whl'
-            lab: '>=4,<5'
+            lab: '>=4.1.0,<5'
           - python: '3.8'
             dist: 'jupyter*lsp*.tar.gz'
-            lab: '>=4,<5'
+            lab: '>=4.1.0,<5'
           - python: '3.11'
             dist: 'jupyter*lsp*.whl'
-            lab: '>=4,<5'
+            lab: '>=4.1.0,<5'
           - python: 'pypy-3.8'
             dist: 'jupyter*lsp*.tar.gz'
-            lab: '>=4,<5'
+            lab: '>=4.1.0,<5'
           - os: 'windows'
             py_cmd: python
           - os: 'macos'
@@ -368,11 +368,11 @@ jobs:
             py_cmd: python
     steps:
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: 'x64'
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: jupyterlab-lsp dist ${{ github.run_number }}
           path: ./dist
@@ -402,23 +402,23 @@ jobs:
       matrix:
         os: [ubuntu]
         python: ['3.8', '3.11']
-        nodejs: ['18']
+        nodejs: ['20.x']
         include:
           - python: '3.8'
-            lab: '>=4,<5'
+            lab: '>=4.1.0,<5'
           - python: '3.11'
-            lab: '>=4,<5'
+            lab: '>=4.1.0,<5'
     steps:
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: 'x64'
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.nodejs }}
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: jupyterlab-lsp dist ${{ github.run_number }}
           path: ./dist

diff --git a/.gitignore b/.gitignore
@@ -1,85 +1,18 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
 
 # Distribution / packaging
-.Python
 build/
-develop-eggs/
 dist/
-downloads/
-eggs/
-.eggs/
 lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
 *.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
 
 # Sphinx documentation
 docs/_build/
 
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
+# Jupyter
+.ipynb_checkpoints/
+.virtual_documents/
 
 # Environments
 .env
@@ -91,39 +24,16 @@ ENV/
 env.bak/
 venv.bak/
 
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-
-node_modules
-.yarn-packages
+# nodejs
+node_modules/
 *.tsbuildinfo
 *.tgz
 
-atest/output/
-.pabotsuitenames
-junit.xml
-coverage/
+# editors
 .vscode/
-_*.d.ts
-_*.ts
-_build
-.virtual_documents/
 .idea/
 
-# Built labextensions
+# generated files
+_*.d.ts
+_*.ts
 python_packages/*/*/labextensions/
-
-# Berry
-.pnp.cjs
-.pnp.loader.mjs
-.yarn/