Merge branch 'master' into fix_address_warnings_on_kernel_initialized…

…_dispatch

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.17.5
+current_version = 1.18.0
 commit = True
 tag = True
 parse = (?P<major>\d+)(\.(?P<minor>\d+))(\.(?P<patch>\d+))((?P<release>.)(?P<build>\d+))?

packages/assets/solara_assets/__init__.py

@@ -1,2 +1,2 @@
 "CDN assets for Solara"
-__version__ = "1.17.5"
+__version__ = "1.18.0"

packages/solara-enterprise/pyproject.toml

@@ -11,7 +11,7 @@ license = {file = "LICENSE"}
 classifiers = ["License :: Free for non-commercial use"]
 dynamic = ["version", "description"]
 dependencies = [
-    "solara==1.17.5",
+    "solara==1.18.0",
 ]
 
 [project.optional-dependencies]

packages/solara-enterprise/solara_enterprise/__init__.py

@@ -1,2 +1,2 @@
 "Enterprise features for Solara"
-__version__ = "1.17.5"
+__version__ = "1.18.0"

pyproject.toml

@@ -81,7 +81,7 @@ dev = [
     "pytest-playwright; python_version > '3.6'",
 ]
 assets = [
-    "solara-assets==1.17.5"
+    "solara-assets==1.18.0"
 ]
 flask = [
     "flask",

release.md

@@ -7,20 +7,20 @@
 ## Making an alpha release
 
 
-    $ ./release.sh patch --new-version 1.17.5a1
+    $ ./release.sh patch --new-version 1.18.0a1
 
 
 # semi automated
 To make a new release
 ```
 # update solara/__init__.py
-$ git add -u && git commit -m 'Release v1.17.5' && git tag v1.17.5 && git push upstream master v1.17.5
+$ git add -u && git commit -m 'Release v1.18.0' && git tag v1.18.0 && git push upstream master v1.18.0
 ```
 
 
 If a problem happens, and you want to keep the history clean
 ```
 # do fix
 $ git rebase -i HEAD~3
-$ git tag v1.17.5 -f &&  git push upstream master v1.17.5 -f
+$ git tag v1.18.0 -f &&  git push upstream master v1.18.0 -f
 ```

solara/__init__.py

@@ -1,5 +1,5 @@
 """Build webapps using IPywidgets"""
-__version__ = "1.17.5"
+__version__ = "1.18.0"
 github_url = "https://github.com/widgetti/solara"
 git_branch = "master"
 

solara/server/patch.py

@@ -69,6 +69,10 @@ def magic(self, *args):
         # proplot requires this
         pass
 
+    def set_custom_exc(self, exc_tuple, handler):
+        # make dask work
+        pass
+
 
 Kernel_instance_original = ipykernel.kernelbase.Kernel.instance.__func__
 

solara/server/static/main-vuetify.js

@@ -79,38 +79,6 @@ function injectDebugMessageInterceptor(kernel) {
 }
 
 
-class WebSocketRedirectWebWorker {
-    // redirects to webworker
-    constructor(url) {
-        console.log('connect url intercepted', url)
-        function make_default(name) {
-            return () => {
-                console.log("default ", name)
-            }
-        }
-        this.onopen = make_default('onopen')
-        this.onclose = make_default('onclose')
-        this.onmessage = make_default('onmessage')
-        setTimeout(() => this.start(), 10)
-    }
-    send(msg) {
-        // console.log('WebSocketRedirectWebWorker: send msg', msg)
-        window.parent.postMessage({ 'type': 'send', 'value': msg })
-    }
-    start() {
-        self.addEventListener('message', async (event) => {
-            let msg = event.data
-            // console.log('WebSocketRedirectWebWorker on msg', msg)
-            if (msg.type == 'send') {
-                this.onmessage({ data: msg.value })
-            }
-        });
-        this.onopen()
-        // solaraWorker.postMessage({ 'type': 'open' })
-    }
-}
-
-
 function getCookiesMap(cookiesString) {
     return cookiesString.split(";")
         .map(function (cookieString) {
@@ -153,13 +121,7 @@ async function solaraInit(mountId, appName) {
         kernel.dispose()
         window.navigator.sendBeacon(close_url);
     });
-    console.log("solara.browser_platform", solara.browser_platform);
-    if (solara.browser_platform) {
-        options = { WebSocket: WebSocketRedirectWebWorker }
-    } else {
-        options = {}
-    }
-    let kernel = await solara.connectKernel(solara.rootPath + '/jupyter', uuid, options)
+    let kernel = await solara.connectKernel(solara.rootPath + '/jupyter', uuid)
     if (!kernel) {
         return;
     }

solara/server/static/solara_bootstrap.py

@@ -119,7 +119,7 @@ async def main():
     ]
     for dep in requirements:
         await micropip.install(dep, keep_going=True)
-    await micropip.install("/wheels/solara-1.17.5-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.18.0-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")