Skip to content

Commit fdb4a5d

Browse files
committed
bumped dev netflix notebook and jupyter tests with new kandy version
1 parent 00d8248 commit fdb4a5d

File tree

4 files changed

+25
-10
lines changed

4 files changed

+25
-10
lines changed

dataframe-jupyter/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ group = "org.jetbrains.kotlinx"
1616
repositories {
1717
// geo repository should come before Maven Central
1818
maven("https://repo.osgeo.org/repository/release")
19+
maven("https://packages.jetbrains.team/maven/p/kds/kotlin-ds-maven")
1920
mavenCentral()
2021
}
2122

@@ -35,6 +36,8 @@ dependencies {
3536

3637
testImplementation(projects.dataframeJupyter)
3738
testImplementation(projects.dataframeGeoJupyter)
39+
testImplementation(libs.kandy.notebook)
40+
testImplementation(libs.kandy.stats)
3841

3942
testImplementation(libs.kotestAssertions) {
4043
exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")

dataframe-jupyter/src/test/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/DataFrameJupyterTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.jetbrains.kotlinx.jupyter.testkit.ReplProvider
77
abstract class DataFrameJupyterTest :
88
JupyterReplTestCase(
99
ReplProvider.forLibrariesTesting(
10-
libraries = setOf("dataframe", "kandy-geo"),
10+
libraries = setOf("dataframe", "kandy-geo", "kandy"),
1111
extraCompilerArguments = listOf(
1212
"-Xopt-in=kotlin.time.ExperimentalTime",
1313
"-Xopt-in=kotlin.uuid.ExperimentalUuidApi",

examples/notebooks/dev/netflix/netflix.ipynb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9474,8 +9474,8 @@
94749474
"}\n",
94759475
"\n",
94769476
"plotBunch {\n",
9477-
" add(p1, 0, 0, 500, 450)\n",
9478-
" add(p2, 500, 0, 500, 450)\n",
9477+
" add(p1, 0.0, 0.0, 500.0, 450.0)\n",
9478+
" add(p2, 500.0, 0.0, 500.0, 450.0)\n",
94799479
"}"
94809480
],
94819481
"outputs": [
@@ -21852,8 +21852,8 @@
2185221852
"}\n",
2185321853
"\n",
2185421854
"plotBunch {\n",
21855-
" add(p1, 0, 0, 500, 700)\n",
21856-
" add(p2, 500, 0, 500, 700)\n",
21855+
" add(p1, 0.0, 0.0, 500.0, 700.0)\n",
21856+
" add(p2, 500.0, 0.0, 500.0, 700.0)\n",
2185721857
"}"
2185821858
],
2185921859
"outputs": [
@@ -27460,8 +27460,8 @@
2746027460
"}\n",
2746127461
"\n",
2746227462
"plotBunch {\n",
27463-
" add(p1, 0, 0, 1000, 500)\n",
27464-
" add(p2, 0, 500, 1000, 500)\n",
27463+
" add(p1, 0.0, 0.0, 1000.0, 500.0)\n",
27464+
" add(p2, 0.0, 500.0, 1000.0, 500.0)\n",
2746527465
"}"
2746627466
],
2746727467
"outputs": [
@@ -31490,8 +31490,8 @@
3149031490
"}\n",
3149131491
"\n",
3149231492
"plotBunch {\n",
31493-
" add(p1, 0, 0, 900, 550)\n",
31494-
" add(p2, 0, 550, 900, 550)\n",
31493+
" add(p1, 0.0, 0.0, 900.0, 550.0)\n",
31494+
" add(p2, 0.0, 550.0, 900.0, 550.0)\n",
3149531495
"}"
3149631496
],
3149731497
"outputs": [

gradle/libs.versions.toml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ geotools = "32.1"
6262
jai-core = "1.1.3"
6363
jts = "1.20.0"
6464

65-
kandy = "0.8.1-dev-82"
65+
# Normal examples Kandy versions
66+
kandy = "0.8.2-dev-87"
67+
68+
# Example notebooks Kandy versions
69+
kandy-notebook = "0.8.1n"
70+
kandy-stats-notebook = "0.5.0n"
71+
6672
exposed = "1.0.0-beta-2"
6773
hibernate = "6.5.2.Final"
6874
hikari = "5.1.0"
@@ -102,6 +108,12 @@ postgresql = { group = "org.postgresql", name = "postgresql", version.ref = "pos
102108
sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
103109
jts = { group = "org.locationtech.jts", name = "jts-core", version.ref = "jtsCore" }
104110

111+
# Example notebooks Kandy versions
112+
kandy-notebook = { group = "org.jetbrains.kotlinx", name = "kandy-lets-plot", version.ref = "kandy-notebook" }
113+
# -- Requires repo: https://packages.jetbrains.team/maven/p/kds/kotlin-ds-maven
114+
kandy-stats = { group = "org.jetbrains.kotlinx", name = "kotlin-statistics-jvm", version.ref = "kandy-stats-notebook" }
115+
116+
# Normal examples Kandy versions
105117
kandy = { group = "org.jetbrains.kotlinx", name = "kandy-lets-plot", version.ref = "kandy" }
106118
kandy-samples-utils = { group = "org.jetbrains.kotlinx", name = "kandy-samples-utils", version.ref = "kandy" }
107119

0 commit comments

Comments
 (0)