Merge pull request #912 from krassowski/maintenance

krassowski · web-flow · commit 2a87e0033e23 · 2023-03-13T20:58:40.000Z
Prepare relase 4.0.0
diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml
@@ -44,7 +44,7 @@ jobs:
       matrix:
         os: [ubuntu]
         nodejs: ['>=14,<15.0.0a0']
-        lab: ['>=3.3.0,<4.0.0a0']
+        lab: ['>=3.6.0,<4.0.0a0']
         r: ['>=4']
     steps:
       - uses: actions/checkout@v3
@@ -124,7 +124,7 @@ jobs:
       matrix:
         os: [ubuntu]
         nodejs: ['>=14,<15.0.0a0']
-        lab: ['>=3.1.0,<4.0.0a0']
+        lab: ['>=3.6.0,<4.0.0a0']
         r: ['>=4']
     steps:
       - uses: actions/checkout@v3
@@ -214,19 +214,18 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu', 'macos', 'windows']
-        python: ['3.7', '3.10']
+        python: ['3.8', '3.10']
         include:
-          # if using 3.7, use newer node, etc...
-          - python: '3.7'
-            # Node 14 end-of-life: April 2023
-            nodejs: '>=14,<15.0.0.a0'
-            r: '<4'
-            lab: '>=3.3.0,<3.4'
+          - python: '3.8'
+            # Node 16 end-of-life: April 2024
+            nodejs: '>=16,<17.0.0.a0'
+            r: '>=4'
+            lab: '>=3.6.0,<4'
           - python: '3.10'
             # Node 16 end-of-life: April 2024
             nodejs: '>=16,<17.0.0.a0'
             r: '>=4'
-            lab: '>=3.4.0,<4'
+            lab: '>=3.6.0,<4'
 
     steps:
       - uses: actions/checkout@v3
@@ -352,26 +351,23 @@ jobs:
       max-parallel: 3
       matrix:
         os: ['ubuntu', 'macos', 'windows']
-        python: ['3.7', '3.8', '3.9', '3.10', 'pypy-3.7']
+        python: ['3.8', '3.9', '3.10', 'pypy-3.8']
         exclude:
           - os: windows
             python: pypy-3.7
         include:
-          - python: '3.7'
-            dist: 'jupyter*lsp*.tar.gz'
-            lab: '>=3.3,<3.4'
           - python: '3.8'
             dist: 'jupyter*lsp*.whl'
-            lab: '>=3.3,<3.4'
+            lab: '>=3.6,<3.7'
           - python: '3.9'
             dist: 'jupyter*lsp*.tar.gz'
-            lab: '>=3.4,<4'
+            lab: '>=3.6,<4'
           - python: '3.10'
             dist: 'jupyter*lsp*.whl'
-            lab: '>=3.4,<4'
-          - python: 'pypy-3.7'
+            lab: '>=3.6,<4'
+          - python: 'pypy-3.8'
             dist: 'jupyter*lsp*.tar.gz'
-            lab: '>=3.4,<4'
+            lab: '>=3.6,<4'
           - os: 'windows'
             py_cmd: python
           - os: 'macos'
@@ -413,13 +409,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu]
-        python: ['3.7', '3.10']
+        python: ['3.8', '3.10']
         nodejs: ['14']
         include:
-          - python: '3.7'
-            lab: '>=3.3,<3.4'
+          - python: '3.8'
+            lab: '>=3.6,<3.7'
           - python: '3.10'
-            lab: '>=3.3,<4'
+            lab: '>=3.6,<4'
     steps:
       - name: Install Python
         uses: actions/setup-python@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## Changelog
 
-### `@jupyter-lsp/jupyterlab-lsp 4.0.0-alpha.0` (not-yet-released)
+### `@jupyter-lsp/jupyterlab-lsp 4.0.0` (not-yet-released)
+
+Requires JupyterLab `>=3.6.0,<4.0.0a0` and Python 3.8 or newer.
 
 - features:
   - implement jump target selector and jump to references ([#739])
@@ -37,9 +39,9 @@
 - downstreams:
   - includes sourcemaps for easier debugging ([#882])
 - maintenance:
-  - handle notifcation promises more explicitly ([#882])
+  - handle notification promises more explicitly ([#882])
 
-### `jupyter-lsp 1.6.0` (not-yet-released)
+### `jupyter-lsp 2.0.0` (not-yet-released)
 
 - dependencies:
   - uses `importlib_metadata` (or `importlib.metadata` on 3.10+) for `entry_points` ([#882])
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -31,11 +31,9 @@ Thank you for all your contributions :heart:
 
 Development requires, at a minimum:
 
-- `nodejs >=14,!=15,<17`
-- `python >=3.7,<3.11.0a0`
-  - Python 3.7 and 3.10 are fully tested on CI
-  - Python 3.7 to 3.10 and PyPy 3 are verified to at least install and import
-- `jupyterlab >=3.3.0,<4.0.0a0`
+- `nodejs >=16,!=17,<19`
+- `python >=3.8,<3.11.0a0`
+- `jupyterlab >=3.6.0,<4.0.0a0`
 
 It is recommended to use a virtual environment (e.g. `virtualenv` or `conda env`)
 for development.
diff --git a/README.md b/README.md
@@ -90,8 +90,8 @@ Use context menu on rows in the panel to filter out diagnostics or copy their me
 
 You will need to have both of the following installed:
 
-- JupyterLab >=3.3.0,<4.0.0a0
-- Python 3.7+
+- JupyterLab >=3.6.0,<4.0.0a0
+- Python 3.8+
 
 In addition, if you wish to use javascript, html, markdown or any other NodeJS-based language server you will need to have appropriate NodeJS version installed.
 
diff --git a/atest/Keywords.resource b/atest/Keywords.resource
@@ -90,6 +90,9 @@ Initialize User Settings
     Create File
     ...    ${SETTINGS DIR}${/}@jupyterlab${/}apputils-extension${/}palette.jupyterlab-settings
     ...    {"modal": false}
+    Create File
+    ...    ${SETTINGS DIR}${/}@jupyterlab${/}apputils-extension${/}notification.jupyterlab-settings
+    ...    {"fetchNews": "false"}
 
 Reset Plugin Settings
     [Arguments]    ${package}=jupyterlab-lsp    ${plugin}=plugin
@@ -381,7 +384,7 @@ Open File
 
 Open in Advanced Settings
     [Arguments]    ${plugin id}
-    IF    '${LAB VERSION}'.startswith('3.3')
+    IF    '${LAB VERSION}'.startswith('3.')
         Lab Command    Advanced JSON Settings Editor
     ELSE
         Lab Command    Advanced Settings Editor
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -6,12 +6,12 @@ channels:
 
 dependencies:
   # runtime dependencies
-  - python >=3.7,<3.11.0a0
-  - jupyterlab >=3.3.0,<4.0.0a0
+  - python >=3.8,<3.11.0a0
+  - jupyterlab >=3.6.0,<4.0.0a0
   - jupyter_server >=1.1.2
   - retrolab >=0.3.0,<0.4
   # build dependencies
-  - nodejs >=14,!=15,<17
+  - nodejs >=16,!=17,<19
   # for python language server (and development)
   - flake8 >=3.5
   - pip
diff --git a/docs/rtd.yml b/docs/rtd.yml
@@ -7,13 +7,13 @@ channels:
 
 dependencies:
   - importlib_metadata
-  - jupyterlab >=3.3.0,<4.0.0a0
+  - jupyterlab >=3.6.0,<4.0.0a0
   - myst-nb
-  - nodejs >=14,!=15,<17
+  - nodejs >=16,!=17,<19
   - pandas
   - pip
   - pytest-check-links
-  - python >=3.7,<3.11.0a0
+  - python >=3.8,<3.11.0a0
   - python-graphviz
   - python-lsp-server
   - robotframework-lsp
diff --git a/packages/_example-extractor/jest.config.js b/packages/_example-extractor/jest.config.js
@@ -7,6 +7,7 @@ const esModules = [
   'lib0',
   'y\\-protocols',
   'y\\-websocket',
+  '@jupyter/ydoc',
   'yjs'
 ].join('|');
 
@@ -26,7 +27,7 @@ let local = {
     '\\.(js|jsx)?$': './transform.js',
     '\\.svg$': 'jest-raw-loader'
   },
-  transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`],
+  transformIgnorePatterns: [`/node_modules/(?!${esModules}).*`],
   testLocationInResults: true,
   reporters: [...upstream['reporters'], 'jest-github-actions-reporter']
 };
diff --git a/packages/code-jumpers/jest.config.js b/packages/code-jumpers/jest.config.js
@@ -14,6 +14,7 @@ const esModules = [
   'lib0',
   'y\\-protocols',
   'y\\-websocket',
+  '@jupyter/ydoc',
   'yjs'
 ].join('|');
 
@@ -25,7 +26,7 @@ let local = {
     '\\.(js|jsx)?$': './transform.js',
     '\\.svg$': 'jest-raw-loader'
   },
-  transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`]
+  transformIgnorePatterns: [`/node_modules/(?!${esModules}).*`]
 };
 
 for (const option of reuseFromUpstream) {
diff --git a/packages/jupyterlab-lsp/jest.config.js b/packages/jupyterlab-lsp/jest.config.js
@@ -14,6 +14,7 @@ const esModules = [
   'lib0',
   'y\\-protocols',
   'y\\-websocket',
+  '@jupyter/ydoc',
   'yjs'
 ].join('|');
 
@@ -25,7 +26,7 @@ let local = {
     '\\.(js|jsx)?$': './transform.js',
     '\\.svg$': 'jest-raw-loader'
   },
-  transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`],
+  transformIgnorePatterns: [`/node_modules/(?!${esModules}).*`],
   testLocationInResults: true,
   reporters: [...upstream['reporters'], 'jest-github-actions-reporter'],
   setupFiles: [
diff --git a/packages/jupyterlab-lsp/package.json b/packages/jupyterlab-lsp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-lsp/jupyterlab-lsp",
-  "version": "4.0.0-alpha.0",
+  "version": "4.0.0",
   "description": "Language Server Protocol integration for JupyterLab",
   "keywords": [
     "jupyter",
@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.4.3",
-    "@jupyterlab/application": "^3.3.0",
+    "@jupyterlab/application": "^3.6.0",
     "@jupyterlab/apputils": "^3.3.0",
     "@jupyterlab/builder": "^3.3.0",
     "@jupyterlab/cells": "^3.3.0",
diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-lsp/jupyterlab-lsp-metapackage",
-  "version": "4.0.0-alpha.0",
+  "version": "4.0.0",
   "description": "JupyterLab LSP - Meta Package. All of the packages used by JupyterLab LSP",
   "homepage": "https://github.com/jupyter-lsp/jupyterlab-lsp",
   "bugs": {
diff --git a/python_packages/jupyter_lsp/jupyter_lsp/_version.py b/python_packages/jupyter_lsp/jupyter_lsp/_version.py
@@ -1,3 +1,3 @@
 """ single source of truth for jupyter_lsp version
 """
-__version__ = "1.6.0"
+__version__ = "2.0.0"
diff --git a/python_packages/jupyter_lsp/setup.cfg b/python_packages/jupyter_lsp/setup.cfg
@@ -26,7 +26,7 @@ classifiers =
 packages = find:
 include_package_data = True
 zip_safe = False
-python_requires = >=3.7
+python_requires = >=3.8
 
 install_requires =
     jupyter_server >=1.1.2
diff --git a/python_packages/jupyterlab_lsp/setup.cfg b/python_packages/jupyterlab_lsp/setup.cfg
@@ -33,8 +33,8 @@ classifiers =
 packages = find:
 include_package_data = True
 zip_safe = False
-python_requires = >=3.7
+python_requires = >=3.8
 
 install_requires =
-    jupyter_lsp >=1.6.0
-    jupyterlab >=3.3.0,<4.0.0a0
+    jupyter_lsp >=2.0.0
+    jupyterlab >=3.6.0,<4.0.0a0
diff --git a/requirements/lab.txt b/requirements/lab.txt
@@ -1,3 +1,3 @@
 # the version of jupyterlab
 -r ./prod.txt
-jupyterlab >=3.3.0,<4.0.0a0
+jupyterlab >=3.6.0,<4.0.0a0
diff --git a/scripts/atest.py b/scripts/atest.py
@@ -29,12 +29,6 @@
     # TODO: restore when yaml-language-server supports both config and...
     # everything else: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/245
     ["language:yaml", "feature:config"],
-    # TODO: restore once busy indicator is CSS-readable on 3.3.x
-    # https://github.com/jupyterlab/jupyterlab/issues/12174
-    ["requires:busy-indicator", "lab:3.3.0"],
-    ["requires:busy-indicator", "lab:3.3.1"],
-    ["requires:busy-indicator", "lab:3.3.2"],
-    ["requires:busy-indicator", "lab:3.3.3"],
     # TODO: restore when we figure out win36 vs jedi on windows
     # ["language:python", "py:36", "os:windows"],
 ]
diff --git a/scripts/lint.py b/scripts/lint.py
@@ -88,7 +88,8 @@ def call_with_print(args):
                 ],
                 # ["pylint", *ALL_PY],
                 ["robotidy", *ALL_ROBOT],
-                ["robocop", *ROBOCOP, *ALL_ROBOT],
+                # see https://github.com/jupyter-lsp/jupyterlab-lsp/issues/911
+                # ["robocop", *ROBOCOP, *ALL_ROBOT],
                 ["python", "scripts/atest.py", "--dryrun", "--console", "dotted"],
                 ["python", "scripts/nblint.py"],
             ],
diff --git a/versions.py b/versions.py
@@ -22,4 +22,4 @@
 JUPYTERLAB_NEXT_MAJOR_VERSION = int(JUPYTERLAB_VERSION.split('.')[0]) + 1
 REQUIRED_JUPYTERLAB = f'>={JUPYTERLAB_VERSION},<{JUPYTERLAB_NEXT_MAJOR_VERSION}.0.0a0'
 REQUIRED_JUPYTER_SERVER = '>=1.1.2'
-REQUIRED_PYTHON = '>=3.7,<3.11.0a0'
+REQUIRED_PYTHON = '>=3.8,<3.11.0a0'
diff --git a/yarn.lock b/yarn.lock
