From 44384b1603f15bb6b69ec6f2086cb7afd6c89678 Mon Sep 17 00:00:00 2001 From: Igor Alshannikov Date: Mon, 1 Jun 2020 20:23:16 -0400 Subject: [PATCH 1/3] Upgrade lets-plot version to 1.4.2. Configure Frontend context. - Add support for GGBunch - Add support for method `show()` in plot and GGBunch --- gradle.properties | 2 +- libraries/lets-plot.json | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 57f63cea9..607debf11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # kotlinVersion=1.4.255-SNAPSHOT -kotlinVersion=1.4.0-dev-7568 +kotlinVersion=1.4.0-dev-7916 kotlinLanguageLevel=1.4 jvmTarget=1.8 diff --git a/libraries/lets-plot.json b/libraries/lets-plot.json index f37f06b67..09f9dc125 100644 --- a/libraries/lets-plot.json +++ b/libraries/lets-plot.json @@ -1,17 +1,14 @@ { "properties": { - "core": "1.0.1-SNAPSHOT", - "kotlin": "0.0.8-SNAPSHOT" + "library_version": "1.4.2", + "api_version": "0.0.14-SNAPSHOT" }, "link": "https://github.com/JetBrains/lets-plot-kotlin", "repositories": [ "https://jetbrains.bintray.com/lets-plot-maven" ], "dependencies": [ - "org.jetbrains.lets-plot:lets-plot-common:$core", - "org.jetbrains.lets-plot:lets-plot-kotlin-api:$kotlin", - "org.jetbrains.lets-plot:kotlin-frontend-api:$kotlin", - "org.jetbrains.lets-plot:lets-plot-jfx:$core" + "org.jetbrains.lets-plot:lets-plot-kotlin-api:$api_version" ], "imports": [ "jetbrains.letsPlot.*", @@ -19,10 +16,17 @@ "jetbrains.letsPlot.stat.*" ], "init": [ - "fun jetbrains.letsPlot.intern.Plot.getHtml() = jetbrains.letsPlot.intern.frontendContext.FrontendContextUtil.getHtml(this)", - "DISPLAY(HTML(jetbrains.datalore.jupyter.configureScript()))" + "import jetbrains.letsPlot.LetsPlot", + "import jetbrains.letsPlot.notebook.jupyter.KotlinJupyterFrontendContext", + "// Setup lets-plot frontend context", + "LetsPlot.frontendContext = KotlinJupyterFrontendContext {DISPLAY(HTML(it))}", + "LetsPlot.libraryVersion = \"$library_version\"", + "LetsPlot.apiVersion = \"$api_version\"", + "// Load library JS", + "DISPLAY(HTML(KotlinJupyterFrontendContext.getConfigureHtml(\"$library_version\")))" ], "renderers": { - "jetbrains.letsPlot.intern.Plot": "HTML(($it as jetbrains.letsPlot.intern.Plot).getHtml())" + "jetbrains.letsPlot.intern.Plot": "HTML(KotlinJupyterFrontendContext.getHtml($it))", + "jetbrains.letsPlot.GGBunch": "HTML(KotlinJupyterFrontendContext.getHtml($it))" } } From d97304ffe751216d47042a1b8a18b6858764304e Mon Sep 17 00:00:00 2001 From: Ilya Muradyan Date: Tue, 2 Jun 2020 07:35:48 +0300 Subject: [PATCH 2/3] Fix runtime branch test --- .../kotlin/org/jetbrains/kotlin/jupyter/test/configTests.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/kotlin/org/jetbrains/kotlin/jupyter/test/configTests.kt b/src/test/kotlin/org/jetbrains/kotlin/jupyter/test/configTests.kt index d7760528b..e126658e8 100644 --- a/src/test/kotlin/org/jetbrains/kotlin/jupyter/test/configTests.kt +++ b/src/test/kotlin/org/jetbrains/kotlin/jupyter/test/configTests.kt @@ -11,7 +11,10 @@ class ConfigTest { fun testBranch() { val branch = runtimeProperties.currentBranch log.debug("Runtime git branch is: $branch") - assertEquals(-1, branch.indexOf('/'), "Branch name should be simple") + + if (!branch.matches(Regex("pull/[1-9][0-9]*"))) + assertEquals(-1, branch.indexOf('/'), "Branch name should be simple") + assertTrue(branch.isNotBlank(), "Branch name shouldn't be blank") } From 6623745b1e413d1f537cbfc951c70f34b3a0adc6 Mon Sep 17 00:00:00 2001 From: Igor Alshannikov Date: Tue, 2 Jun 2020 20:01:45 -0400 Subject: [PATCH 3/3] Switch to api 0.0.17-SNAPSHOT - support for environment variable "LETS_PLOT_HTML_ISOLATED_FRAME" (Datalore integration) - `isolatedFrame` parameter. Usage: `%use lets-plot(isolatedFrame=true)` - LetsPlot.getInfo() --- libraries/lets-plot.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/lets-plot.json b/libraries/lets-plot.json index 09f9dc125..ab3024647 100644 --- a/libraries/lets-plot.json +++ b/libraries/lets-plot.json @@ -1,14 +1,15 @@ { "properties": { - "library_version": "1.4.2", - "api_version": "0.0.14-SNAPSHOT" + "libraryVersion": "1.4.2", + "apiVersion": "0.0.17-SNAPSHOT", + "isolatedFrame": "" }, "link": "https://github.com/JetBrains/lets-plot-kotlin", "repositories": [ "https://jetbrains.bintray.com/lets-plot-maven" ], "dependencies": [ - "org.jetbrains.lets-plot:lets-plot-kotlin-api:$api_version" + "org.jetbrains.lets-plot:lets-plot-kotlin-api:$apiVersion" ], "imports": [ "jetbrains.letsPlot.*", @@ -17,16 +18,15 @@ ], "init": [ "import jetbrains.letsPlot.LetsPlot", - "import jetbrains.letsPlot.notebook.jupyter.KotlinJupyterFrontendContext", - "// Setup lets-plot frontend context", - "LetsPlot.frontendContext = KotlinJupyterFrontendContext {DISPLAY(HTML(it))}", - "LetsPlot.libraryVersion = \"$library_version\"", - "LetsPlot.apiVersion = \"$api_version\"", + "import jetbrains.letsPlot.frontend.NotebookFrontendContext", + "val isolatedFrameParam = if(\"$isolatedFrame\".isNotEmpty()) \"$isolatedFrame\".toBoolean() else null", + "val frontendContext = LetsPlot.setupNotebook(\"$libraryVersion\", isolatedFrameParam) {DISPLAY(HTML(it))}", + "LetsPlot.apiVersion = \"$apiVersion\"", "// Load library JS", - "DISPLAY(HTML(KotlinJupyterFrontendContext.getConfigureHtml(\"$library_version\")))" + "DISPLAY(HTML(frontendContext.getConfigureHtml()))" ], "renderers": { - "jetbrains.letsPlot.intern.Plot": "HTML(KotlinJupyterFrontendContext.getHtml($it))", - "jetbrains.letsPlot.GGBunch": "HTML(KotlinJupyterFrontendContext.getHtml($it))" + "jetbrains.letsPlot.intern.Plot": "HTML(frontendContext.getHtml($it))", + "jetbrains.letsPlot.GGBunch": "HTML(frontendContext.getHtml($it))" } }