Merge branch 'master' into readAllSqlTables-duckdb-fix2

Author: Jolanrensen

README.md

@@ -42,7 +42,7 @@ Explore [**documentation**](https://kotlin.github.io/dataframe) for details.
 You could find the following articles there:
 
 * [Guides and Examples](https://kotlin.github.io/dataframe/guides-and-examples.html)
-* [Get started with Kotlin DataFrame](https://kotlin.github.io/dataframe/gettingstarted.html)
+* [Get started with Kotlin DataFrame](https://kotlin.github.io/dataframe/setup.html)
 * [Working with Data Schemas](https://kotlin.github.io/dataframe/schemas.html)
 * [Setup compiler plugin in Gradle project](https://kotlin.github.io/dataframe/compiler-plugin.html)
 * [Full list of all supported operations](https://kotlin.github.io/dataframe/operations.html)
@@ -61,7 +61,7 @@ Check out this [notebook with new features](examples/notebooks/feature_overviews
 ## Setup
 
 > For more detailed instructions on how to get started with Kotlin DataFrame, refer to the
-> [Getting Started](https://kotlin.github.io/dataframe/gettingstarted.html).
+> [Getting Started](https://kotlin.github.io/dataframe/setup.html).
 
 ### Kotlin Notebook
 

build.gradle.kts

@@ -20,10 +20,13 @@ plugins {
  alias(publisher)
  alias(serialization) apply false
  alias(dokka)
- alias(kover)
+// alias(kover)
  alias(ktlint)
- alias(korro) apply false
- alias(kodex) apply false
+
+ // TODO cannot define korro and kodex here due to leaking them kotlin-compiler-embeddable into the build classpath
+ // alias(korro) apply false
+ // alias(kodex) apply false
+
  alias(simpleGit) apply false
  alias(dependencyVersions)
  alias(buildconfig) apply false
@@ -41,7 +44,7 @@ repositories {
  mavenLocal()
  mavenCentral()
  maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
- maven(jupyterApiTCRepo)
+ if (jupyterApiTCRepo.isNotBlank()) maven(jupyterApiTCRepo)
 }
 
 configurations {
@@ -61,15 +64,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> {
@@ -155,6 +158,7 @@ val modulesUsingJava11 = with(projects) {
  dataframeGeo,
  examples.ideaExamples.titanic,
  tests,
+ plugins.dataframeGradlePlugin,
  )
 }.map { it.path }
 
@@ -204,6 +208,7 @@ allprojects {
  configure<BuildConfigExtension> {
  packageName = "org.jetbrains.kotlinx.dataframe"
  className = "BuildConfig"
+ buildConfigField("KOTLIN_VERSION", libs.versions.kotlin.asProvider().get())
  buildConfigField("VERSION", "${project.version}")
  buildConfigField("DEBUG", findProperty("kotlin.dataframe.debug")?.toString()?.toBoolean() ?: false)
  }
@@ -248,8 +253,8 @@ kotlinPublications {
  fairDokkaJars = false
 
  sonatypeSettings(
- project.findProperty("kds.sonatype.user") as String?,
- project.findProperty("kds.sonatype.password") as String?,
+ project.findProperty("kds.sonatype.central.username") as String?,
+ project.findProperty("kds.sonatype.central.password") as String?,
  "dataframe project, v. ${project.version}",
  )
 

core/api/core.api

@@ -13,7 +13,7 @@ plugins {
  alias(publisher)
  alias(serialization)
  alias(korro)
- alias(kover)
+// alias(kover)
  alias(ktlint)
  alias(kodex)
  alias(simpleGit)
@@ -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"
@@ -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 {
@@ -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"
@@ -167,7 +167,7 @@ val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
  classpath = sourceSets.test.get().runtimeClasspath
 
  doLast {
- addSamplesToGit.executeCommand()
+ addSamplesToGit.get().executeCommand()
  }
 }
 
@@ -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> {
@@ -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 {

core/build.gradle.kts

@@ -137,14 +137,16 @@ public typealias ColumnsSelector<T, C> = Selector<ColumnsSelectionDsl<T>, Column
 // region filters
 
 /**
- * ## Row Filter
+ * A lambda expression that evaluates a row of the [DataFrame]
+ * and returns a [Boolean] indicating whether the row should be included in the result.
  *
- * [RowFilter] is a lambda function expecting a [Boolean] result given an instance of [DataRow]`<T>` as context
- * (`this` and `it`).
+ * The lambda has access to the [`DataRow<T>`][DataRow] both as `this` and as `it`,
+ * enabling concise and readable conditions.
  *
- * Return `true` if the row should be included in the result.
+ * Commonly used in operations such as [filter][org.jetbrains.kotlinx.dataframe.api.filter],
+ * [drop][org.jetbrains.kotlinx.dataframe.api.drop], and others.
  *
- * Shorthand for:
+ * Equivalent to:
  * ```kotlin
  * DataRow<T>.(it: DataRow<T>) -> Boolean
  * ```

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/aliases.kt

@@ -964,6 +964,15 @@ public fun <T> DataFrame<T>.dropNulls(whereAllNull: Boolean = false, columns: Co
  }
 }
 
+@Refine
+@Interpretable("DropNulls0")
+@Deprecated(
+ "DataFrame conventional name for filterNot* functions is drop*",
+ ReplaceWith("dropNulls(columns = columns)"),
+ DeprecationLevel.ERROR,
+)
+public fun <T> DataFrame<T>.filterNotNull(columns: ColumnsSelector<T, *>): DataFrame<T> = dropNulls(columns = columns)
+
 /**
  * ## The Drop Nulls Operation
  *
@@ -1256,6 +1265,8 @@ public fun <T> DataFrame<T>.dropNA(vararg columns: AnyColumnReference, whereAllN
  * If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
  * If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
  */
+@Refine
+@Interpretable("DropNa1")
 public fun <T> DataFrame<T>.dropNA(whereAllNA: Boolean = false): DataFrame<T> = dropNA(whereAllNA) { all() }
 
 /**