Merge pull request #655 from krassowski/v3.8.1

Prepare release 3.8.1
jupyter-lsp · Aug 2, 2021 · 0dda5ce · 0dda5ce
2 parents 84782eb + 25932ae
commit 0dda5ce
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,22 @@
 ## Changelog
 
-### `@krassowski/jupyterlab-lsp 3.8.1` (unreleased)
+### `@krassowski/jupyterlab-lsp 3.8.1` (2021-08-02)
 
 - bug fixes:
-  - remove spurious `ValidationError` warnings for non-installed servers ([#645)], thanks @karlaspuldaro)
-  - `%Rdevice` magic is now properly overridden and won't be extracted to R code ([#646)])
-  - Fix hover rendering for MarkedStrings, fix hover disappearing when moving mouse towards it ([#653)])
+  - `%Rdevice` magic is now properly overridden and won't be extracted to R code ([#646])
+  - Fix hover rendering for 1MarkedString1s, fix hover disappearing when moving mouse towards it ([#653])
 
-[#645]: https://github.com/krassowski/jupyterlab-lsp/pull/645
 [#646]: https://github.com/krassowski/jupyterlab-lsp/pull/646
 [#653]: https://github.com/krassowski/jupyterlab-lsp/pull/653
 
+### `jupyter-lsp 1.4.1` (2021-08-02)
+
+- bug fixes:
+  - remove spurious `ValidationError` warnings for non-installed servers ([#645], thanks @karlaspuldaro)
+  - reduce number and verbosity of logs on startup
+
+[#645]: https://github.com/krassowski/jupyterlab-lsp/pull/645
+
 ### `@krassowski/jupyterlab-lsp 3.8.0` (2021-07-04)
 
 - improvements:

diff --git a/packages/jupyterlab-lsp/package.json b/packages/jupyterlab-lsp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "description": "Language Server Protocol integration for JupyterLab",
   "keywords": [
     "jupyter",

diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp-metapackage",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "description": "JupyterLab LSP - Meta Package. All of the packages used by JupyterLab LSP",
   "homepage": "https://github.com/krassowski/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.4.0"
+__version__ = "1.4.1"
diff --git a/python_packages/jupyter_lsp/jupyter_lsp/manager.py b/python_packages/jupyter_lsp/jupyter_lsp/manager.py
@@ -228,6 +228,8 @@ def _autodetect_language_servers(self, only_installed: bool):
         except Exception:  # pragma: no cover
             self.log.exception("Failed to load entry_points")
 
+        skipped_servers = []
+
         for ep_name, ep in entry_points.items():
             try:
                 spec_finder = ep.load()  # type: SpecMaker
@@ -244,9 +246,7 @@ def _autodetect_language_servers(self, only_installed: bool):
                     if hasattr(spec_finder, "is_installed"):
                         spec_finder_from_base = cast(SpecBase, spec_finder)
                         if not spec_finder_from_base.is_installed(self):
-                            self.log.info(
-                                _("Skipping non-installed server: `{}`").format(ep.name)
-                            )
+                            skipped_servers.append(ep.name)
                             continue
                 specs = spec_finder(self) or {}
             except Exception as err:  # pragma: no cover
@@ -274,6 +274,13 @@ def _autodetect_language_servers(self, only_installed: bool):
             for key, spec in specs.items():
                 yield key, spec
 
+        if skipped_servers:
+            self.log.info(
+                _("Skipped non-installed server(s): {}").format(
+                    ", ".join(skipped_servers)
+                )
+            )
+
 
 # the listener decorator
 lsp_message_listener = LanguageServerManager.register_message_listener  # noqa
diff --git a/python_packages/jupyter_lsp/setup.py b/python_packages/jupyter_lsp/setup.py
@@ -5,6 +5,7 @@
 import setuptools
 
 setuptools.setup(
+    name="jupyter-lsp",
     version=re.findall(
         r"""__version__ = "([^"]+)"$""",
         (Path(__file__).parent / "jupyter_lsp" / "_version.py").read_text(

diff --git a/python_packages/jupyterlab_lsp/setup.py b/python_packages/jupyterlab_lsp/setup.py
@@ -40,4 +40,7 @@ def get_data_files():
 setuptools.setup(
     version=f"{_version}{_release}",
     data_files=get_data_files(),
+    # explicit name as a workaround for GitHub dependency analyzer
+    # not discovering Python packages otherwise
+    name="jupyterlab-lsp",
 )
diff --git a/yarn.lock b/yarn.lock
@@ -11756,9 +11756,9 @@ puppeteer@^1.17.0:
     ws "^6.1.0"
 
 pyright@^1.1:
-  version "1.1.140"
-  resolved "https://registry.yarnpkg.com/pyright/-/pyright-1.1.140.tgz#2692f67b2769e664983dff3fefee4c0e4d12f4fa"
-  integrity sha512-isJj7cahjEK7xAy5/aLJ4TfzLJGA4SCWqPk1pLJA3k8S6VUo4FIiPrvHOd1LM2gxImqgef4rwUeHRC+vrOKLRQ==
+  version "1.1.159"
+  resolved "https://registry.yarnpkg.com/pyright/-/pyright-1.1.159.tgz#185228546adbaff6dbac6127e91a16aa6846e319"
+  integrity sha512-KCKxW9MWLTTmM6CMHixpgX0H+eZO40aAQwXs1qji4Ru+Yq/KJCGb2b7eTqXMoRxEqz1cIinvpaoH11R54gUBGQ==
 
 q@^1.5.1:
   version "1.5.1"