Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade lets-plot version to 1.4.2 #79

Merged
merged 2 commits into from
Jun 2, 2020
Merged

Upgrade lets-plot version to 1.4.2 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44384b1
Upgrade lets-plot version to 1.4.2. Configure Frontend context.
alshan Jun 2, 2020
d97304f
Fix runtime branch test
ileasile Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
22 changes: 13 additions & 9 deletions libraries/lets-plot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
{
"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.*",
"jetbrains.letsPlot.geom.*",
"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))"
}
}
5 changes: 4 additions & 1 deletion src/test/kotlin/org/jetbrains/kotlin/jupyter/test/configTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down