Skip to content
Merged
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
22 changes: 11 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
alias(publisher)
alias(serialization) apply false
alias(dokka)
alias(kover)
// alias(kover)
alias(ktlint)
alias(korro) apply false
alias(kodex) apply false
Expand All @@ -41,7 +41,7 @@ repositories {
mavenLocal()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
maven(jupyterApiTCRepo)
if (jupyterApiTCRepo.isNotBlank()) maven(jupyterApiTCRepo)
}

configurations {
Expand All @@ -61,15 +61,15 @@ dependencies {
// experimental, so not included by default:
// api(projects.dataframeOpenapi)

kover(projects.core)
kover(projects.dataframeArrow)
kover(projects.dataframeExcel)
kover(projects.dataframeOpenapi)
kover(projects.dataframeJdbc)
kover(projects.dataframeCsv)
kover(projects.dataframeJson)
kover(projects.plugins.kotlinDataframe)
kover(projects.dataframeJupyter)
// kover(projects.core)
// kover(projects.dataframeArrow)
// kover(projects.dataframeExcel)
// kover(projects.dataframeOpenapi)
// kover(projects.dataframeJdbc)
// kover(projects.dataframeCsv)
// kover(projects.dataframeJson)
// kover(projects.plugins.kotlinDataframe)
// kover(projects.dataframeJupyter)
}

enum class Version : Comparable<Version> {
Expand Down
46 changes: 23 additions & 23 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
alias(publisher)
alias(serialization)
alias(korro)
alias(kover)
// alias(kover)
alias(ktlint)
alias(kodex)
alias(simpleGit)
Expand Down Expand Up @@ -112,10 +112,10 @@ tasks.withType<KspTask> {
}
}

val clearTestResults by tasks.creating(Delete::class) {
val clearTestResults by tasks.registering(Delete::class, fun Delete.() {
delete(layout.buildDirectory.dir("dataframes"))
delete(layout.buildDirectory.dir("korroOutputLines"))
}
})

val samplesTest = tasks.register<Test>("samplesTest") {
group = "Verification"
Expand All @@ -140,7 +140,7 @@ val samplesTest = tasks.register<Test>("samplesTest") {
sourceSets["main"].runtimeClasspath
}

val clearSamplesOutputs by tasks.creating {
val clearSamplesOutputs by tasks.registering {
group = "documentation"

doFirst {
Expand All @@ -152,11 +152,11 @@ val clearSamplesOutputs by tasks.creating {
}
}

val addSamplesToGit by tasks.creating(GitTask::class) {
val addSamplesToGit by tasks.registering(GitTask::class, fun GitTask.() {
directory = file(".")
command = "add"
args = listOf("-A", "../docs/StardustDocs/resources/snippets")
}
})

val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
group = "documentation"
Expand All @@ -167,7 +167,7 @@ val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
classpath = sourceSets.test.get().runtimeClasspath

doLast {
addSamplesToGit.executeCommand()
addSamplesToGit.get().executeCommand()
}
}

Expand Down Expand Up @@ -240,7 +240,7 @@ idea {
// If `changeJarTask` is run, modify all Jar tasks such that before running the Kotlin sources are set to
// the target of `processKdocMain`, and they are returned to normal afterward.
// This is usually only done when publishing
val changeJarTask by tasks.creating {
val changeJarTask by tasks.registering {
outputs.upToDateWhen { project.hasProperty("skipKodex") }
doFirst {
tasks.withType<Jar> {
Expand Down Expand Up @@ -372,21 +372,21 @@ tasks.withType<KotlinCompile> {

tasks.test {
maxHeapSize = "2048m"
kover {
currentProject {
instrumentation { disabledForTestTasks.addAll("samplesTest") }
}
reports {
total {
filters {
excludes {
classes("org.jetbrains.kotlinx.dataframe.jupyter.*")
classes("org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests")
}
}
}
}
}
// kover {
// currentProject {
// instrumentation { disabledForTestTasks.addAll("samplesTest") }
// }
// reports {
// total {
// filters {
// excludes {
// classes("org.jetbrains.kotlinx.dataframe.jupyter.*")
// classes("org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests")
// }
// }
// }
// }
// }
}

kotlinPublications {
Expand Down
2 changes: 1 addition & 1 deletion dataframe-arrow/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
with(libs.plugins) {
alias(kotlin.jvm)
alias(publisher)
alias(kover)
// alias(kover)
alias(ktlint)
alias(binary.compatibility.validator)
}
Expand Down
4 changes: 2 additions & 2 deletions dataframe-csv/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
alias(kotlin.jvm)
alias(publisher)
alias(serialization)
alias(kover)
// alias(kover)
alias(ktlint)
alias(kodex)
alias(binary.compatibility.validator)
Expand Down Expand Up @@ -106,7 +106,7 @@ tasks.named("runKtlintCheckOverGeneratedSourcesSourceSet") {
// If `changeJarTask` is run, modify all Jar tasks such that before running the Kotlin sources are set to
// the target of `processKdocMain`, and they are returned to normal afterward.
// This is usually only done when publishing
val changeJarTask by tasks.creating {
val changeJarTask by tasks.registering {
outputs.upToDateWhen { false }
doFirst {
tasks.withType<Jar> {
Expand Down
2 changes: 1 addition & 1 deletion dataframe-excel/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
with(libs.plugins) {
alias(kotlin.jvm)
alias(publisher)
alias(kover)
// alias(kover)
alias(ktlint)
alias(binary.compatibility.validator)
}
Expand Down
2 changes: 1 addition & 1 deletion dataframe-jdbc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
with(libs.plugins) {
alias(kotlin.jvm)
alias(publisher)
alias(kover)
// alias(kover)
alias(ktlint)
alias(binary.compatibility.validator)
}
Expand Down
2 changes: 1 addition & 1 deletion dataframe-json/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
alias(kotlin.jvm)
alias(publisher)
alias(serialization)
alias(kover)
// alias(kover)
alias(ktlint)
alias(binary.compatibility.validator)
}
Expand Down
2 changes: 1 addition & 1 deletion dataframe-jupyter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
with(libs.plugins) {
alias(kotlin.jvm)
alias(publisher)
alias(kover)
// alias(kover)
alias(ktlint)
alias(jupyter.api)
alias(binary.compatibility.validator)
Expand Down
4 changes: 2 additions & 2 deletions dataframe-openapi-generator/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
alias(kotlin.jvm)
alias(publisher)
alias(serialization)
alias(kover)
// alias(kover)
alias(ktlint)
alias(binary.compatibility.validator)
}
Expand All @@ -18,7 +18,7 @@ val jupyterApiTCRepo: String by project
repositories {
mavenLocal()
mavenCentral()
maven(jupyterApiTCRepo)
if (jupyterApiTCRepo.isNotBlank()) maven(jupyterApiTCRepo)
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
</style>
</head>
<body>
<table class="dataframe" id="df_-637534208"></table>
<table class="dataframe" id="df_234881024"></table>

<p class="dataframe_description"></p>
</body>
Expand Down Expand Up @@ -458,23 +458,23 @@

/*<!--*/
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"user: String\">user</span>", children: [], rightAlign: false, values: ["Alice","Bob"] },
{ name: "<span title=\"orders: DataFrame<*>\">orders</span>", children: [], rightAlign: false, values: [{ frameId: -637534207, value: "<b>DataFrame 2 x 2</b>" },{ frameId: -637534206, value: "<b>DataFrame 3 x 2</b>" }] },
], id: -637534208, rootId: -637534208, totalRows: 2 } ) });
{ name: "<span title=\"orders: DataFrame<*>\">orders</span>", children: [], rightAlign: false, values: [{ frameId: 234881025, value: "<b>DataFrame 2 x 2</b>" },{ frameId: 234881026, value: "<b>DataFrame 3 x 2</b>" }] },
], id: 234881024, rootId: 234881024, totalRows: 2 } ) });
/*-->*/

/*<!--*/
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"orderId: Int\">orderId</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">101</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">102</span></span>"] },
{ name: "<span title=\"amount: Double\">amount</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">50.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">75.5</span></span>"] },
], id: -637534207, rootId: -637534208, totalRows: 2 } ) });
], id: 234881025, rootId: 234881024, totalRows: 2 } ) });
/*-->*/

/*<!--*/
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"orderId: Int\">orderId</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">103</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">104</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">105</span></span>"] },
{ name: "<span title=\"amount: Double\">amount</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">20.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">30.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">25.0</span></span>"] },
], id: -637534206, rootId: -637534208, totalRows: 3 } ) });
], id: 234881026, rootId: 234881024, totalRows: 3 } ) });
/*-->*/

call_DataFrame(function() { DataFrame.renderTable(-637534208) });
call_DataFrame(function() { DataFrame.renderTable(234881024) });

function sendHeight() {
const table = document.querySelector('table.dataframe');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
</style>
</head>
<body>
<table class="dataframe" id="df_-637534205"></table>
<table class="dataframe" id="df_234881027"></table>

<p class="dataframe_description"></p>
</body>
Expand Down Expand Up @@ -460,10 +460,10 @@
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"ColumnA: Int\">ColumnA</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>"] },
{ name: "<span title=\"column_b: String\">column_b</span>", children: [], rightAlign: false, values: ["a","b"] },
{ name: "<span title=\"COLUMN-C: Boolean\">COLUMN-C</span>", children: [], rightAlign: false, values: ["true","false"] },
], id: -637534205, rootId: -637534205, totalRows: 2 } ) });
], id: 234881027, rootId: 234881027, totalRows: 2 } ) });
/*-->*/

call_DataFrame(function() { DataFrame.renderTable(-637534205) });
call_DataFrame(function() { DataFrame.renderTable(234881027) });

function sendHeight() {
const table = document.querySelector('table.dataframe');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
</style>
</head>
<body>
<table class="dataframe" id="df_-637534204"></table>
<table class="dataframe" id="df_234881028"></table>

<p class="dataframe_description"></p>
</body>
Expand Down Expand Up @@ -460,10 +460,10 @@
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"columnA: Int\">columnA</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>"] },
{ name: "<span title=\"column_b: String\">column_b</span>", children: [], rightAlign: false, values: ["a","b"] },
{ name: "<span title=\"columnC: Boolean\">columnC</span>", children: [], rightAlign: false, values: ["true","false"] },
], id: -637534204, rootId: -637534204, totalRows: 2 } ) });
], id: 234881028, rootId: 234881028, totalRows: 2 } ) });
/*-->*/

call_DataFrame(function() { DataFrame.renderTable(-637534204) });
call_DataFrame(function() { DataFrame.renderTable(234881028) });

function sendHeight() {
const table = document.querySelector('table.dataframe');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
</style>
</head>
<body>
<table class="dataframe" id="df_-637534203"></table>
<table class="dataframe" id="df_234881029"></table>

<p class="dataframe_description"></p>
</body>
Expand Down Expand Up @@ -460,10 +460,10 @@
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"columnA: Int\">columnA</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>"] },
{ name: "<span title=\"columnB: String\">columnB</span>", children: [], rightAlign: false, values: ["a","b"] },
{ name: "<span title=\"columnC: Boolean\">columnC</span>", children: [], rightAlign: false, values: ["true","false"] },
], id: -637534203, rootId: -637534203, totalRows: 2 } ) });
], id: 234881029, rootId: 234881029, totalRows: 2 } ) });
/*-->*/

call_DataFrame(function() { DataFrame.renderTable(-637534203) });
call_DataFrame(function() { DataFrame.renderTable(234881029) });

function sendHeight() {
const table = document.querySelector('table.dataframe');
Expand Down
Loading