Fix jupyterlab nightly versions

Signed-off-by: Andrew Stein <steinlink@gmail.com>

Author: texodus

packages/perspective-jupyterlab/build.mjs

@@ -136,11 +136,7 @@ async function build_all() {
     });
 
     const pkg = JSON.parse(fs.readFileSync("../../package.json").toString());
-    const version = pkg.version.replace(/-(rc|alpha|beta)\.\d+/, (x) =>
-        x.replace("-", "").replace(".", "")
-    );
-
-    const labext_dest = `../../rust/perspective-python/perspective_python-${version}.data/data/share/jupyter/labextensions/@finos/perspective-jupyterlab`;
+    const labext_dest = `../../rust/perspective-python/perspective_python-${pkg.version}.data/data/share/jupyter/labextensions/@finos/perspective-jupyterlab`;
     await cpy(["dist/cjs/**/*"], labext_dest);
 }
 

rust/perspective-python/perspective/widget/__init__.py

@@ -22,12 +22,11 @@
 from traitlets import Unicode, observe
 from .viewer import PerspectiveViewer
 
-__version__ = re.sub(
-    "(rc|alpha|beta)", "-\\1.", importlib.metadata.version("perspective-python")
-)
+__version__ = re.sub(".dev[0-9]+", "", importlib.metadata.version("perspective-python"))
 
 __all__ = ["PerspectiveWidget"]
 
+
 class PerspectiveWidget(DOMWidget, PerspectiveViewer):
     """:class`~perspective.PerspectiveWidget` allows for Perspective to be used
     in the form of a Jupyter IPython widget.
@@ -160,6 +159,7 @@ def __init__(
             loading = self.load(data, **self._options)
             if inspect.isawaitable(loading):
                 import asyncio
+
                 asyncio.create_task(loading)
 
     def load(self, data, **options):
@@ -212,16 +212,16 @@ def handle_message(self, widget, content, buffers):
             logging.debug("view {} connected", client_id)
 
             def send_response(msg):
-                self.send(
-                    {"type": "binary_msg", "client_id": client_id}, [msg]
-                )
+                self.send({"type": "binary_msg", "client_id": client_id}, [msg])
+
             self._sessions[client_id] = self.new_proxy_session(send_response)
         elif content["type"] == "binary_msg":
             [binary_msg] = buffers
             client_id = content["client_id"]
             session = self._sessions[client_id]
             if session is not None:
                 import asyncio
+
                 asyncio.create_task(session.handle_request_async(binary_msg))
             else:
                 logging.error("No session for client_id {}".format(client_id))

tools/perspective-scripts/version.mjs

@@ -192,6 +192,10 @@ async function update_package_jsons() {
     fs.writeFileSync("./package.json", pkg_json);
     const packages = {};
     for (const ws of pkg.workspaces) {
+        if (ws === "packages/perspective-jupyterlab" && IS_NIGHTLY) {
+            continue;
+        }
+
         for (const path of glob.sync(`${ws}/package.json`, {
             sync: true,
         })) {