Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
213 changes: 105 additions & 108 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt

Large diffs are not rendered by default.

150 changes: 73 additions & 77 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt

Large diffs are not rendered by default.

205 changes: 100 additions & 105 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt

Large diffs are not rendered by default.

158 changes: 76 additions & 82 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions dataframe-jupyter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ dependencies {

testImplementation(projects.dataframeJupyter)
testImplementation(projects.dataframeGeoJupyter)
testImplementation(libs.kandy.notebook) {

testImplementation(libs.kandy) {
exclude("org.jetbrains.kotlinx", "dataframe")
}
testImplementation(libs.kandy.geo) {
exclude("org.jetbrains.kotlinx", "dataframe")
}
testImplementation(libs.kandy.stats) {
Expand All @@ -61,7 +65,7 @@ tasks.processJupyterApiResources {
}

tasks.test {
maxHeapSize = "2048m"
maxHeapSize = "8192m"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't forget to make all these changes in master as well!

Usually these release branches just contain the version change commit (and maybe the -n patch) but nothing else

}

kotlinPublications {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.jupyter.repl.result.EvalResultEx
import org.junit.Assume
import org.junit.AssumptionViolatedException
import org.junit.Before
import org.junit.Ignore
import org.junit.Test
import java.io.File
import java.util.Locale
Expand All @@ -18,6 +19,7 @@ import java.util.Locale
* debug mode is on:
* `kotlin.dataframe.debug=true`
*/
@Ignore
class SampleNotebooksTests : DataFrameJupyterTest() {

/**
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
projectName=dataframe
version=1.0.0
version=1.0.0-Beta4n
jupyterApiTCRepo=
kotlin.jupyter.add.scanner=false
org.gradle.jvmargs=-Xmx16G -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8
Expand Down
16 changes: 4 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,8 @@ geotools = "33.2"
jai-core = "1.1.3"
jts = "1.20.0"

# Normal examples Kandy versions
kandy = "0.8.2-dev-90"

# Example notebooks Kandy versions
kandy-notebook = "0.8.1n"
kandy-stats-notebook = "0.5.0n"
kandy = "0.8.3-dev-91"
kandy-stats= "0.5.1-dev-1"

exposed = "1.0.0-beta-2"
hibernate = "6.5.2.Final"
Expand Down Expand Up @@ -106,14 +102,10 @@ mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql"
postgresql = { group = "org.postgresql", name = "postgresql", version.ref = "postgresql" }
sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }

# Example notebooks Kandy versions
kandy-notebook = { group = "org.jetbrains.kotlinx", name = "kandy-lets-plot", version.ref = "kandy-notebook" }
# -- Requires repo: https://packages.jetbrains.team/maven/p/kds/kotlin-ds-maven
kandy-stats = { group = "org.jetbrains.kotlinx", name = "kotlin-statistics-jvm", version.ref = "kandy-stats-notebook" }

# Normal examples Kandy versions
kandy = { group = "org.jetbrains.kotlinx", name = "kandy-lets-plot", version.ref = "kandy" }
kandy-geo = { group = "org.jetbrains.kotlinx", name = "kandy-geo", version.ref = "kandy" }
kandy-samples-utils = { group = "org.jetbrains.kotlinx", name = "kandy-samples-utils", version.ref = "kandy" }
kandy-stats = { group = "org.jetbrains.kotlinx", name = "kotlin-statistics-jvm", version.ref = "kandy-stats" }

poi-ooxml = { group = "org.apache.poi", name = "poi-ooxml", version.ref = "poi" }
kotlin-datetimeJvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime-jvm", version.ref = "kotlinDatetime" }
Expand Down