Skip to content
Open
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
12 changes: 6 additions & 6 deletions dataframe-jupyter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ repositories {
mavenCentral()
}

fun ExternalModuleDependency.excludeDataFrame() = exclude("org.jetbrains.kotlinx", "dataframe")

dependencies {
api(projects.dataframe)

Expand All @@ -36,12 +38,10 @@ dependencies {

testImplementation(projects.dataframeJupyter)
testImplementation(projects.dataframeGeoJupyter)
testImplementation(libs.kandy.notebook) {
exclude("org.jetbrains.kotlinx", "dataframe")
}
testImplementation(libs.kandy.stats) {
exclude("org.jetbrains.kotlinx", "dataframe")
}

testImplementation(libs.kandy) { excludeDataFrame() }
testImplementation(libs.kandy.geo) { excludeDataFrame() }
testImplementation(libs.kandy.stats) { excludeDataFrame() }

testImplementation(libs.kotestAssertions) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
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-92"
Copy link
Collaborator

Choose a reason for hiding this comment

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

so, we only use kandy in notebooks? so only the -n version?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No, kandy doesn't have a "-n" version now.

Copy link
Collaborator

Choose a reason for hiding this comment

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

And that works fine? Does it include DataFrame as compileOnly() now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It works fine both in gradle and notebooks, but you need to add dataframe dependency first.
And no, DataFrame is included as implementation

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

So we need to ask user to %use dataframe before kandy!

kandy-stats= "0.5.1-dev-2"

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
Loading