Skip to content

Commit acd76b7

Browse files
committed
Merge branch 'master' into add-dot-local-node-root
2 parents 99dd175 + 4c7cb7c commit acd76b7

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

.github/workflows/job.test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ jobs:
228228
include:
229229
# if using 3.7, use newer node, etc...
230230
- python: '3.7'
231-
# Node 12 end-of-life: April 2022
232-
nodejs: '>=12,<13.0.0.a0'
231+
# Node 14 end-of-life: April 2023
232+
nodejs: '>=14,<15.0.0.a0'
233233
r: '<4'
234234
lab: '>=3.1.0,<3.2'
235235
- python: '3.10'

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Thank you for all your contributions :heart:
3131

3232
Development requires, at a minimum:
3333

34-
- `nodejs >=12,!=13,!=15,<17`
34+
- `nodejs >=14,!=15,<17`
3535
- `python >=3.7,<3.11.0a0`
3636
- Python 3.7 and 3.10 are fully tested on CI
3737
- Python 3.7 to 3.10 and PyPy 3 are verified to at least install and import

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ Use of a python `virtualenv` or a conda env is also recommended.
128128
R ([languageserver](https://github.com/REditorSupport/languageserver)) servers:
129129

130130
```bash
131-
# note: you may want to use our fork of python-language-server instead (see below)
132131
pip install 'python-lsp-server[all]'
133132
R -e 'install.packages("languageserver")'
134133
```
@@ -164,8 +163,6 @@ Use of a python `virtualenv` or a conda env is also recommended.
164163

165164
or permanently by setting `c.Completer.use_jedi = False` in your
166165
[`ipython_config.py` file](https://ipython.readthedocs.io/en/stable/config/intro.html?highlight=ipython_config.py#systemwide-configuration).
167-
You will also benefit from using experimental version of python-language-server
168-
as described in the Note 2 (above).
169166

170167
1. (Optional, Linux/OSX-only) to enable opening files outside of the root
171168
directory (the place where you start JupyterLab), create `.lsp_symlink` and

atest/05_Features/Completion.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Force Tags feature:completion
1212
${COMPLETER_BOX} css:.jp-Completer.jp-HoverBox
1313
${DOCUMENTATION_PANEL} css:.jp-Completer-docpanel
1414
${KERNEL_BUSY_INDCA_OLD} css:.jp-NotebookPanel-toolbar div[title="Kernel Busy"]
15-
${KERNEL_BUSY_INDICATOR} css:.jp-Notebook-ExecutionIndicator div[data-status="busy"]
15+
${KERNEL_BUSY_INDICATOR} css:.jp-Notebook-ExecutionIndicator[data-status="busy"]
1616

1717

1818
*** Test Cases ***

atest/07_Configuration.robot

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@ Settings Should Change Editor Diagnostics
7676
Capture Page Screenshot 03-settings-changed.png
7777
IF ${needs reload}
7878
Reload After Configuration ${language} ${file}
79+
# allow longer after reload
80+
Wait Until Page Contains Element ${after diagnostic} timeout=60s
81+
ELSE
82+
Wait Until Page Contains Element ${after diagnostic} timeout=30s
7983
END
80-
Wait Until Page Contains Element ${after diagnostic} timeout=30s
8184
Capture Page Screenshot 04-configured-diagnostic-found.png
8285
[Teardown] Clean Up After Working with File and Settings ${file}
8386

atest/Variables.resource

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ ${CSS DIALOG OK} css:.jp-Dialog .jp-mod-accept
2929
${MENU OPEN WITH} xpath://div[contains(@class, 'lm-Menu-itemLabel')][contains(text(), "Open With")]
3030
# R is missing on purpose (may need to use .)
3131
${MENU RENAME} xpath://div[contains(@class, 'lm-Menu-itemLabel')][contains(., "ename")]
32-
# N is missing on purpose
33-
${MENU NOTEBOOK} xpath://div[contains(@class, 'lm-Menu-itemLabel')][contains(., "otebook")]
32+
# N is missing on purpose (N is in separate <span>)
33+
${MENU NOTEBOOK} xpath://li[@data-command='filebrowser:open']/div[contains(@class, 'lm-Menu-itemLabel')][contains(., "otebook")]
3434
${DIAGNOSTICS PANEL} id:lsp-diagnostics-panel
3535
${DIAGNOSTIC PANEL CLOSE} css:.lm-DockPanel-tabBar .lm-TabBar-tab[data-id="lsp-diagnostics-panel"] .lm-TabBar-tabCloseIcon
3636
${DIALOG WINDOW} css:.jp-Dialog

binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- jupyter_server >=1.1.2
1212
- retrolab >=0.3.0,<0.4
1313
# build dependencies
14-
- nodejs >=12,!=13,!=15,<17
14+
- nodejs >=14,!=15,<17
1515
# for python language server (and development)
1616
- flake8 >=3.5
1717
- pip

docs/Language Servers.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
"servers; you can get it with:\n",
226226
"\n",
227227
"```bash\n",
228-
"conda install -c conda-forge nodejs\n",
228+
"conda install --channel conda-forge nodejs\n",
229229
"# or one of the following, as an administrator\n",
230230
"choco install nodejs # Windows with Chocolatey\n",
231231
"sudo apt-get install nodejs # Debian/Ubuntu\n",
@@ -318,7 +318,7 @@
318318
"#### Example: Getting a $\\LaTeX$ stack\n",
319319
"\n",
320320
"```bash\n",
321-
"conda install -y conda-forge tectonic texlab chktex\n",
321+
"conda install --channel conda-forge tectonic texlab chktex\n",
322322
"```\n",
323323
"\n",
324324
"This will install:\n",

docs/rtd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- importlib_metadata
1010
- jupyterlab >=3.1.0,<4.0.0a0
1111
- myst-nb
12-
- nodejs >=12,!=13,!=15,<17
12+
- nodejs >=14,!=15,<17
1313
- pandas
1414
- pip
1515
- pytest-check-links

0 commit comments

Comments
 (0)