Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build against JupyterLab 4.1, fix tests #1057

Merged
merged 43 commits into from
Feb 25, 2024
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
2019b4a
start updating contrib setup
bollwyvl Jan 18, 2024
f974b0c
start reworking test infra
bollwyvl Jan 20, 2024
cf0d8fd
clean up some .gitignore
bollwyvl Jan 20, 2024
28c060c
more docs
bollwyvl Jan 20, 2024
7bad027
split out rtd steps
bollwyvl Jan 20, 2024
0a67b37
more docs
bollwyvl Jan 20, 2024
0bc42db
add roll-up reporting
bollwyvl Jan 21, 2024
869198f
more work on coverage
bollwyvl Jan 22, 2024
16515bf
Merge remote-tracking branch 'upstream/main' into gh-1038-fix-cov
bollwyvl Feb 7, 2024
d083f7a
linting
bollwyvl Feb 7, 2024
7f3fa59
force uninstall of server package in binder
bollwyvl Feb 7, 2024
9b12f42
slow down on lab startup, pin to lab 4.0.x for now
bollwyvl Feb 8, 2024
d55b556
tighten up lab dependencies for now
bollwyvl Feb 8, 2024
7af5cb2
Pin to lab 4.1
krassowski Feb 23, 2024
dfb3849
Move to JupyterLab 4.1, fix tests and eslint config
krassowski Feb 23, 2024
173b48b
Remove old notebook server instructions
krassowski Feb 23, 2024
e873f04
Fix version specifiers
krassowski Feb 23, 2024
de1e8e2
Pin pytest <8
krassowski Feb 23, 2024
1e55d75
Fix data-files spec in setup.cfg
krassowski Feb 23, 2024
5908adc
Try removing cache settings
krassowski Feb 23, 2024
2b329cf
Try to re-enable `installStatePath`
krassowski Feb 23, 2024
b9d0259
Align upload and download artifact versions
krassowski Feb 23, 2024
f710b76
Try to enable cacheFolder customization
krassowski Feb 23, 2024
ccdc218
Use `jp-button`
krassowski Feb 23, 2024
3ef59e3
Workaround issue with cell not getting entered
krassowski Feb 23, 2024
8b44cd5
Fix failure mode test
krassowski Feb 23, 2024
3a706ae
Cleanup duplicated line, misaligned version,
krassowski Feb 24, 2024
c3252c1
Try permissive decoding to get it to work on Windows
krassowski Feb 24, 2024
cedc43b
Require patched version of `@rjsf/utils`
krassowski Feb 24, 2024
f5d8157
Do wait for some server log even if extension is disabled
krassowski Feb 24, 2024
0eebf0c
Remove no-longer needed VirtualDocument overrides
krassowski Feb 24, 2024
fe97658
Take advantage of new LSP extension factory for syntax highlight feature
krassowski Feb 24, 2024
a4e820b
Use `extensionFactory` for highlights feature
krassowski Feb 24, 2024
9e9661b
Port diagnostics, hover, jump, signature to `extensionFactory`,
krassowski Feb 24, 2024
3cc80d5
Workaround file adapter not emitting signal used to instantiate
krassowski Feb 24, 2024
7713b97
Fix diagnostics tests
krassowski Feb 24, 2024
f401568
Only press enter if not focused after click, fixing highlight tests
krassowski Feb 24, 2024
4779dc2
Remove duplicated focus/blur handler which was causing issue caught by
krassowski Feb 24, 2024
08f15d5
Fix completion overrides not being properly applied
krassowski Feb 24, 2024
790f2d2
The rlint diagnostic for `{}` is a moving target...
krassowski Feb 24, 2024
f18127c
Update setup-python to v5
krassowski Feb 24, 2024
f413be8
Await for kernel restart to complete
krassowski Feb 24, 2024
e8de5d1
Use explicit sleep for kernel restart
krassowski Feb 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
68 changes: 34 additions & 34 deletions .github/workflows/job.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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: |
Expand All @@ -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: |
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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: |
Expand All @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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: |
Expand All @@ -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: |
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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'
Expand All @@ -372,7 +372,7 @@ jobs:
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
Expand Down Expand Up @@ -402,12 +402,12 @@ 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
Expand All @@ -418,7 +418,7 @@ jobs:
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
Expand Down
108 changes: 9 additions & 99 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/
Loading
Loading