Skip to content

Commit ce0bf03

Browse files
committed
Fix tests
1 parent cfcf825 commit ce0bf03

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ The following maven repositories are included by default:
115115
### Line Magics
116116

117117
The following line magics are supported:
118-
- `%use` - injects code for supported libraries: artifact resolution, default imports, initialization code, type renderers. Usage example: `%use klaxon(5.0.1), lets-plot`
118+
- `%use` - injects code for supported libraries: artifact resolution, default imports, initialization code, type renderers. Usage example: `%use klaxon(5.5), lets-plot`
119119
- `%trackClasspath` - logs any changes of current classpath. Useful for debugging artifact resolution failures.
120120
- `%trackExecution` - logs pieces of code that are going to be executed. Useful for debugging of libraries support.
121121
- `%useLatestDescriptors` - use latest versions of library descriptors available. By default, bundled descriptors are used. Usage example: `%useLatestDescriptors -[on|off]`

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m -Xmx2048m
2828
# Turn off README check when running check task
2929
skipReadmeCheck=false
3030

31-
jupyterApiVersion=0.9.1-5
31+
jupyterApiVersion=0.9.1-42
3232
kotlin.jupyter.add.api=false
3333
kotlin.jupyter.add.scanner=false

kotlin-jupyter-plugin/common-dependencies/src/main/kotlin/org/jetbrains/kotlinx/jupyter/common/ReplLineMagic.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jetbrains.kotlinx.jupyter.common
22

33
enum class ReplLineMagic(val desc: String, val argumentsUsage: String? = null, val visibleInHelp: Boolean = true) {
4-
USE("injects code for supported libraries: artifact resolution, default imports, initialization code, type renderers", "klaxon(5.0.1), lets-plot"),
4+
USE("injects code for supported libraries: artifact resolution, default imports, initialization code, type renderers", "klaxon(5.5), lets-plot"),
55
TRACK_CLASSPATH("logs any changes of current classpath. Useful for debugging artifact resolution failures"),
66
TRACK_EXECUTION("logs pieces of code that are going to be executed. Useful for debugging of libraries support"),
77
DUMP_CLASSES_FOR_SPARK("stores compiled repl classes in special folder for Spark integration", visibleInHelp = false),

libraries/klaxon.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"description": "JSON parser for Kotlin",
33
"properties": {
4-
"v": "5.2"
4+
"v": "5.5"
55
},
66
"link": "https://github.com/cbeust/klaxon",
77
"dependencies": [

libraries/krangl.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
22
"description": "Kotlin DSL for data wrangling",
33
"properties": {
4-
"v": "-SNAPSHOT"
4+
"v": "0.16.2"
55
},
66
"link": "https://github.com/holgerbrandl/krangl",
7-
"repositories": [
8-
"https://jitpack.io"
9-
],
107
"dependencies": [
118
"com.github.holgerbrandl:krangl:$v"
129
],

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/ReplWithResolverTests.kt

+8-6
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ class ReplWithResolverTests : AbstractReplTest() {
106106
@file:DependsOn("org.geotools:gt-shapefile:[23,)")
107107
@file:DependsOn("org.geotools:gt-cql:[23,)")
108108
109-
%use lets-plot@f98400094c0650d3497f3fda9910dd86705ee655(api=1.1.0)
109+
%use lets-plot@cfcf8257116ad3753b176a9f779eaaea4619dacd(api=2.0.1)
110110
111-
@file:DependsOn("org.jetbrains.lets-plot-kotlin:lets-plot-kotlin-geotools:1.1.0")
111+
@file:DependsOn("org.jetbrains.lets-plot:lets-plot-kotlin-geotools:2.0.1")
112112
113113
import jetbrains.letsPlot.toolkit.geotools.toSpatialDataset
114114
""".trimIndent()
@@ -140,7 +140,7 @@ class ReplWithResolverTests : AbstractReplTest() {
140140

141141
val res = repl.eval(
142142
"""
143-
%use krangl(0.13)
143+
%use krangl(0.16.2)
144144
val df = DataFrame.readCSV("src/test/testData/resolve-with-runtime.csv")
145145
df.head().rows.first().let { it["name"].toString() + " " + it["surname"].toString() }
146146
""".trimIndent()
@@ -167,7 +167,7 @@ class ReplWithResolverTests : AbstractReplTest() {
167167
fun testUseFileUrlRef() {
168168
val repl = getReplWithStandardResolver()
169169

170-
val commit = "561ce1a324a9434d3481456b11678851b48a3132"
170+
val commit = "cfcf8257116ad3753b176a9f779eaaea4619dacd"
171171
val libraryPath = "src/test/testData/test-init.json"
172172

173173
val res1 = repl.eval(
@@ -237,7 +237,7 @@ class ReplWithResolverTests : AbstractReplTest() {
237237
fun testRuntimeDepsResolution() {
238238
val res = repl.eval(
239239
"""
240-
%use krangl(0.13)
240+
%use krangl(0.16.2)
241241
val df = DataFrame.readCSV("src/test/testData/resolve-with-runtime.csv")
242242
df.head().rows.first().let { it["name"].toString() + " " + it["surname"].toString() }
243243
""".trimIndent()
@@ -258,7 +258,9 @@ class ReplWithResolverTests : AbstractReplTest() {
258258
fun testKlaxonClasspathDoesntLeak() {
259259
val res = repl.eval(
260260
"""
261-
%use klaxon(2.1.8)
261+
@file:DependsOn("src/test/testData/klaxon-2.1.8.jar")
262+
import com.beust.klaxon.*
263+
262264
class Person (val name: String, var age: Int = 23)
263265
val klaxon = Klaxon()
264266
val parseRes = klaxon.parse<Person>(""${'"'}

src/test/testData/klaxon-2.1.8.jar

128 KB
Binary file not shown.

0 commit comments

Comments
 (0)