From 94065f69068ce314b94d57ffc97ce37f64fcd385 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 23 Sep 2024 12:01:07 +0200 Subject: [PATCH 1/4] bumping project and bootstrap versions --- gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6fcbca9f35..c54b38e032 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ projectName=dataframe -version=0.14.0 +version=0.15.0 jupyterApiTCRepo= kotlin.jupyter.add.scanner=false org.gradle.jvmargs=-Xmx4G diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d32ab1ce5..9f6e3ec147 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ libsPublisher = "1.9.23-dev-45" # "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs, # dogfood Gradle / KSP plugins in tests and idea-examples modules -dataframe = "0.14.0-RC1" +dataframe = "0.14.0" korro = "0.1.6" kover = "0.8.3" From 45ef5d185a153c885d8a8184ec7bf42f5499b677 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 23 Sep 2024 12:01:55 +0200 Subject: [PATCH 2/4] bumping version to 0.14 in docs --- .github/workflows/main.yml | 2 +- README.md | 11 ++++++----- docs/StardustDocs/project.ihp | 6 +++--- docs/StardustDocs/v.list | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7bc47b7347..f510baf6aa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ env: ALGOLIA_INDEX_NAME: prod_DATAFRAME_HELP ALGOLIA_KEY: ${{ secrets.ALGOLIA_KEY }} CONFIG_JSON_PRODUCT: Dataframe - CONFIG_JSON_VERSION: '0.13' + CONFIG_JSON_VERSION: '0.14' jobs: build-job: diff --git a/README.md b/README.md index 4ccf02b1b8..cef28a4b21 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Kotlin DataFrame: typesafe in-memory structured data processing for JVM [![JetBrains incubator project](https://jb.gg/badges/incubator.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) [![Kotlin component alpha stability](https://img.shields.io/badge/project-alpha-kotlin.svg?colorA=555555&colorB=DB3683&label=&logo=kotlin&logoColor=ffffff&logoWidth=10)](https://kotlinlang.org/docs/components-stability.html) -[![Kotlin](https://img.shields.io/badge/kotlin-1.9.22-blue.svg?logo=kotlin)](http://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-2.0.20-blue.svg?logo=kotlin)](http://kotlinlang.org) [![Dynamic XML Badge](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fjetbrains%2Fkotlinx%2Fdataframe%2Fmaven-metadata.xml&query=%2F%2Fversion%5Bnot%28contains%28text%28%29%2C%22dev%22%29%29%5D%5Blast%28%29%5D&label=Release%20version)](https://search.maven.org/artifact/org.jetbrains.kotlinx/dataframe) [![Dynamic XML Badge](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fjetbrains%2Fkotlinx%2Fdataframe%2Fmaven-metadata.xml&query=%2F%2Fversion%5Bcontains%28text%28%29%2C%22dev%22%29%5D%5Blast%28%29%5D&label=Dev%20version&color=yellow )](https://search.maven.org/artifact/org.jetbrains.kotlinx/dataframe) @@ -41,18 +41,18 @@ You could find the following articles there: Check out this [notebook with new features](examples/notebooks/feature_overviews/0.14.0/new_features.ipynb) in development for the next release. The DataFrame compiler plugin has reached public preview! -Here's a [compiler plugin demo project](https://github.com/koperagen/df-plugin-demo) that works with IntelliJ IDEA 2024.2. +Here's a [compiler plugin demo project](https://github.com/koperagen/df-plugin-demo) that works with [IntelliJ IDEA](https://www.jetbrains.com/idea/) 2024.2. ## Setup ```kotlin -implementation("org.jetbrains.kotlinx:dataframe:0.13.1") +implementation("org.jetbrains.kotlinx:dataframe:0.14.0") ``` Optional Gradle plugin for enhanced type safety and schema generation https://kotlin.github.io/dataframe/schemasgradle.html ```kotlin -id("org.jetbrains.kotlinx.dataframe") version "0.13.1" +id("org.jetbrains.kotlinx.dataframe") version "0.14.0" ``` Check out the [custom setup page](https://kotlin.github.io/dataframe/gettingstartedgradleadvanced.html) if you don't need some of the formats as dependencies, @@ -77,7 +77,7 @@ df.filter { "stargazers_count"() > 50 }.print() Requires Gradle plugin to work ```kotlin -id("org.jetbrains.kotlinx.dataframe") version "0.13.1" +id("org.jetbrains.kotlinx.dataframe") version "0.14.0" ``` Plugin generates extension properties API for provided sample of data. Column names and their types become discoverable in completion. @@ -228,6 +228,7 @@ This table shows the mapping between main library component versions and minimum | 0.12.0 | 8 | 1.9.0 | 0.11.0-358 | 3.0.0 | 11.0.0 | | 0.12.1 | 8 | 1.9.0 | 0.11.0-358 | 3.0.0 | 11.0.0 | | 0.13.1 | 8 | 1.9.22 | 0.12.0-139 | 3.0.0 | 15.0.0 | +| 0.14.0 | 8 | 2.0.20 | 0.12.0-139 | 3.0.0 | 17.0.0 | ## Code of Conduct diff --git a/docs/StardustDocs/project.ihp b/docs/StardustDocs/project.ihp index 8dd53cdf2a..8b61cb8e47 100644 --- a/docs/StardustDocs/project.ihp +++ b/docs/StardustDocs/project.ihp @@ -4,10 +4,10 @@ - - + + - + diff --git a/docs/StardustDocs/v.list b/docs/StardustDocs/v.list index a0056e5a39..75de6809a4 100644 --- a/docs/StardustDocs/v.list +++ b/docs/StardustDocs/v.list @@ -1,5 +1,5 @@ - + From dfb46f18d99fd631865dbaffae7b634aca79ff21 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 23 Sep 2024 12:23:21 +0200 Subject: [PATCH 3/4] updating deprecations post 0.14 --- .../dataframe/api/ColumnsSelectionDsl.kt | 24 +--- .../jetbrains/kotlinx/dataframe/api/all.kt | 134 ------------------ .../kotlinx/dataframe/api/allExcept.kt | 113 --------------- .../kotlinx/dataframe/api/colGroups.kt | 32 ----- .../kotlinx/dataframe/api/colsAtAnyDepth.kt | 24 ---- .../kotlinx/dataframe/api/colsInGroups.kt | 44 ------ .../jetbrains/kotlinx/dataframe/api/select.kt | 30 ---- .../kotlinx/dataframe/api/simplify.kt | 8 -- .../dataframe/columns/ColumnWithPath.kt | 40 ------ .../dataframe/util/deprecationMessages.kt | 71 +--------- 10 files changed, 10 insertions(+), 510 deletions(-) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt index b782cb0dcb..a9eb9cd298 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt @@ -1,9 +1,12 @@ package org.jetbrains.kotlinx.dataframe.api import org.jetbrains.kotlinx.dataframe.ColumnsSelector -import org.jetbrains.kotlinx.dataframe.DataColumn import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.DataRow +import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar +import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnSetPartOfGrammar +import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.DefinitionsPartOfGrammar +import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.PlainDslPartOfGrammar import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnSet import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver @@ -16,9 +19,6 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.DataFrameReceiver -import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnsList -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_LIST_DATACOLUMN_GET -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_LIST_DATACOLUMN_GET_REPLACE import kotlin.reflect.KProperty /** [Columns Selection DSL][ColumnsSelectionDsl] */ @@ -380,22 +380,6 @@ public interface ColumnsSelectionDsl : // SingleColumn> public operator fun ColumnsSelector.invoke(): ColumnsResolver = this@invoke(this@ColumnsSelectionDsl, this@ColumnsSelectionDsl) - /** - * ## Deprecated: Columns by Index Range from List of Columns - * Helper function to create a [ColumnSet] from a list of columns by specifying a range of indices. - * - * ### Deprecated - * - * Deprecated because it's too niche. Let us know if you have a good use for it! - */ - @Deprecated( - message = COL_SELECT_DSL_LIST_DATACOLUMN_GET, - replaceWith = ReplaceWith(COL_SELECT_DSL_LIST_DATACOLUMN_GET_REPLACE), - level = DeprecationLevel.ERROR, - ) - public operator fun List>.get(range: IntRange): ColumnSet = - ColumnsList(subList(range.first, range.last + 1)) - // region select // NOTE: due to invoke conflicts these cannot be moved out of the interface diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt index e4db42854f..8911eb96ae 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt @@ -45,20 +45,6 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.addPath import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.owner -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_AFTER -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_BEFORE -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_FROM -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_FROM_REPLACE -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_REPLACE -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_UP_TO -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_FROM -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_FROM_REPLACE -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_UP_TO -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_UP_TO_REPLACE import kotlin.reflect.KProperty // region DataColumn @@ -1187,126 +1173,6 @@ public interface AllColumnsSelectionDsl { public fun ColumnPath.allColsUpTo(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsUpTo(column) // endregion - - // region deprecated - - @Deprecated( - COL_SELECT_DSL_ALL_COLS, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.all(): TransformableColumnSet<*> = allCols() - - @Deprecated( - COL_SELECT_DSL_ALL_COLS, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun String.all(): TransformableColumnSet<*> = allCols() - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_AFTER, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allAfter(column: ColumnPath): ColumnSet<*> = allColsAfter(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_AFTER, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allAfter(column: String): ColumnSet<*> = allColsAfter(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_AFTER, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allAfter(column: AnyColumnReference): ColumnSet<*> = allColsAfter(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_BEFORE, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allBefore(column: ColumnPath): ColumnSet<*> = allColsBefore(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_BEFORE, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allBefore(column: String): ColumnSet<*> = allColsBefore(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_BEFORE, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allBefore(column: AnyColumnReference): ColumnSet<*> = allColsBefore(column) - - @Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR) - public fun ColumnsSelectionDsl<*>.allSince(column: ColumnPath): ColumnSet<*> = allFrom(column) - - @Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR) - public fun ColumnsSelectionDsl<*>.allSince(column: String): ColumnSet<*> = allFrom(column) - - @Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR) - public fun ColumnsSelectionDsl<*>.allSince(column: AnyColumnReference): ColumnSet<*> = allFrom(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_FROM, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allSince(column: ColumnPath): ColumnSet<*> = allColsFrom(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_FROM, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allSince(column: String): ColumnSet<*> = allColsFrom(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_FROM, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allSince(column: AnyColumnReference): ColumnSet<*> = allColsFrom(column) - - @Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR) - public fun ColumnsSelectionDsl<*>.allUntil(column: ColumnPath): ColumnSet<*> = allUpTo(column) - - @Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR) - public fun ColumnsSelectionDsl<*>.allUntil(column: String): ColumnSet<*> = allUpTo(column) - - @Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR) - public fun ColumnsSelectionDsl<*>.allUntil(column: AnyColumnReference): ColumnSet<*> = allUpTo(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_UP_TO, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allUntil(column: ColumnPath): ColumnSet<*> = allColsUpTo(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_UP_TO, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allUntil(column: String): ColumnSet<*> = allColsUpTo(column) - - @Deprecated( - COL_SELECT_DSL_ALL_COLS_UP_TO, - ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.allUntil(column: AnyColumnReference): ColumnSet<*> = allColsUpTo(column) - - // endregion } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt index f94bd27dd3..1031dc3848 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt @@ -24,15 +24,6 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_EXCEPT import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_REPLACE import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_REPLACE_VARARG -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_EXCEPT -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_EXCEPT_REPLACE_SELECTOR -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_SINGLE_COL_EXCEPT -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHER -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHERS -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_RESOLVER -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_RESOLVERS -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_SELECTOR import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -1017,110 +1008,6 @@ public interface AllExceptColumnsSelectionDsl { columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) // endregion - - // region deprecated - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_SELECTOR), - level = DeprecationLevel.ERROR, - ) - public infix fun SingleColumn>.except(selector: ColumnsSelector): ColumnSet<*> = - allColsExcept(selector) - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_RESOLVER), - level = DeprecationLevel.ERROR, - ) - public infix fun SingleColumn>.except(other: ColumnsResolver<*>): ColumnSet<*> = allColsExcept { other } - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_RESOLVERS), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.except(vararg others: ColumnsResolver<*>): ColumnSet<*> = - allColsExcept { others.toColumnSet() } - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHER), - level = DeprecationLevel.ERROR, - ) - public infix fun SingleColumn>.except(other: String): ColumnSet<*> = allColsExcept(other) - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHERS), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.except(vararg others: String): ColumnSet<*> = allColsExcept(*others) - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHER), - level = DeprecationLevel.ERROR, - ) - public infix fun SingleColumn>.except(other: KProperty<*>): ColumnSet<*> = allColsExcept(other) - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHERS), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.except(vararg others: KProperty<*>): ColumnSet<*> = allColsExcept(*others) - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHER), - level = DeprecationLevel.ERROR, - ) - public infix fun SingleColumn>.except(other: ColumnPath): ColumnSet<*> = allColsExcept(other) - - @Deprecated( - message = COL_SELECT_DSL_SINGLE_COL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHERS), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.except(vararg others: ColumnPath): ColumnSet<*> = allColsExcept(*others) - - @Deprecated( - message = COL_SELECT_DSL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_SELECTOR), - level = DeprecationLevel.ERROR, - ) - public fun ColumnsSelectionDsl.except(selector: ColumnsSelector): ColumnSet<*> = allExcept(selector) - - @Deprecated( - message = COL_SELECT_DSL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER), - level = DeprecationLevel.ERROR, - ) - public fun ColumnsSelectionDsl<*>.except(vararg others: ColumnsResolver<*>): ColumnSet<*> = allExcept(*others) - - @Deprecated( - message = COL_SELECT_DSL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER), - level = DeprecationLevel.ERROR, - ) - public fun ColumnsSelectionDsl<*>.except(vararg others: String): ColumnSet<*> = allExcept(*others) - - @Deprecated( - message = COL_SELECT_DSL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER), - level = DeprecationLevel.ERROR, - ) - public fun ColumnsSelectionDsl<*>.except(vararg others: KProperty<*>): ColumnSet<*> = allExcept(*others) - - @Deprecated( - message = COL_SELECT_DSL_EXCEPT, - replaceWith = ReplaceWith(COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER), - level = DeprecationLevel.ERROR, - ) - public fun ColumnsSelectionDsl<*>.except(vararg others: ColumnPath): ColumnSet<*> = allExcept(*others) - - // endregion } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt index 35bde01f9a..9d09935703 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt @@ -19,8 +19,6 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet -import org.jetbrains.kotlinx.dataframe.util.COLS_SELECT_DSL_GROUP -import org.jetbrains.kotlinx.dataframe.util.COLS_SELECT_DSL_GROUP_REPLACE import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -171,36 +169,6 @@ public interface ColGroupsColumnsSelectionDsl { */ public fun ColumnPath.colGroups(filter: Predicate> = { true }): TransformableColumnSet = columnGroup(this).colGroups(filter) - - // region deprecated - - @Deprecated(COLS_SELECT_DSL_GROUP, ReplaceWith(COLS_SELECT_DSL_GROUP_REPLACE), DeprecationLevel.ERROR) - public fun ColumnSet<*>.groups(filter: Predicate> = { true }): TransformableColumnSet = - columnGroupsInternal(filter) - - @Deprecated(COLS_SELECT_DSL_GROUP, ReplaceWith(COLS_SELECT_DSL_GROUP_REPLACE), DeprecationLevel.ERROR) - public fun SingleColumn>.groups( - filter: Predicate> = { true }, - ): TransformableColumnSet = this.ensureIsColumnGroup().columnGroupsInternal(filter) - - @Deprecated(COLS_SELECT_DSL_GROUP, ReplaceWith(COLS_SELECT_DSL_GROUP_REPLACE), DeprecationLevel.ERROR) - public fun ColumnsSelectionDsl<*>.groups( - filter: Predicate> = { true }, - ): TransformableColumnSet = this.asSingleColumn().columnGroupsInternal(filter) - - @Deprecated(COLS_SELECT_DSL_GROUP, ReplaceWith(COLS_SELECT_DSL_GROUP_REPLACE), DeprecationLevel.ERROR) - public fun String.groups(filter: Predicate> = { true }): TransformableColumnSet = - columnGroup(this).colGroups(filter) - - @Deprecated(COLS_SELECT_DSL_GROUP, ReplaceWith(COLS_SELECT_DSL_GROUP_REPLACE), DeprecationLevel.ERROR) - public fun KProperty<*>.groups(filter: Predicate> = { true }): TransformableColumnSet = - columnGroup(this).colGroups(filter) - - @Deprecated(COLS_SELECT_DSL_GROUP, ReplaceWith(COLS_SELECT_DSL_GROUP_REPLACE), DeprecationLevel.ERROR) - public fun ColumnPath.groups(filter: Predicate> = { true }): TransformableColumnSet = - columnGroup(this).colGroups(filter) - - // endregion } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt index f977cb5e91..5aa97f5af1 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt @@ -17,11 +17,7 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak -import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet -import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.atAnyDepthImpl -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_AT_ANY_DEPTH -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_AT_ANY_DEPTH_REPLACE import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -180,26 +176,6 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { columnGroup(this).colsAtAnyDepth(predicate) // endregion - - // region deprecated recursively - - @Deprecated(COL_SELECT_DSL_AT_ANY_DEPTH, ReplaceWith(COL_SELECT_DSL_AT_ANY_DEPTH_REPLACE), DeprecationLevel.ERROR) - public fun TransformableColumnSet.recursively(): ColumnSet = - atAnyDepthImpl(includeTopLevel = true, includeGroups = true) - - @Deprecated(COL_SELECT_DSL_AT_ANY_DEPTH, ReplaceWith(COL_SELECT_DSL_AT_ANY_DEPTH_REPLACE), DeprecationLevel.ERROR) - public fun TransformableColumnSet.rec(): ColumnSet = - atAnyDepthImpl(includeTopLevel = true, includeGroups = true) - - @Deprecated(COL_SELECT_DSL_AT_ANY_DEPTH, ReplaceWith(COL_SELECT_DSL_AT_ANY_DEPTH_REPLACE), DeprecationLevel.ERROR) - public fun TransformableSingleColumn<*>.recursively(): SingleColumn<*> = - atAnyDepthImpl(includeTopLevel = true, includeGroups = true) - - @Deprecated(COL_SELECT_DSL_AT_ANY_DEPTH, ReplaceWith(COL_SELECT_DSL_AT_ANY_DEPTH_REPLACE), DeprecationLevel.ERROR) - public fun TransformableSingleColumn<*>.rec(): SingleColumn<*> = - atAnyDepthImpl(includeTopLevel = true, includeGroups = true) - - // endregion } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt index 9214c4e332..b129a4ed1e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt @@ -17,10 +17,6 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.transform -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_CHILDREN -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_CHILDREN_REPLACE -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_CHILDREN_SINGLE_COL -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_CHILDREN_SINGLE_COL_REPLACE import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -176,46 +172,6 @@ public interface ColsInGroupsColumnsSelectionDsl { */ public fun ColumnPath.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).colsInGroups(predicate) - - // region deprecated - - @Deprecated(COL_SELECT_DSL_CHILDREN, ReplaceWith(COL_SELECT_DSL_CHILDREN_REPLACE), level = DeprecationLevel.ERROR) - public fun ColumnSet<*>.children(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = - colsInGroups(predicate) - - @Deprecated( - COL_SELECT_DSL_CHILDREN_SINGLE_COL, - ReplaceWith(COL_SELECT_DSL_CHILDREN_SINGLE_COL_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.children(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = - ensureIsColumnGroup().colsInternal(predicate) - - @Deprecated( - COL_SELECT_DSL_CHILDREN_SINGLE_COL, - ReplaceWith(COL_SELECT_DSL_CHILDREN_SINGLE_COL_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun String.children(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = - columnGroup(this).ensureIsColumnGroup().colsInternal(predicate) - - @Deprecated( - COL_SELECT_DSL_CHILDREN_SINGLE_COL, - ReplaceWith(COL_SELECT_DSL_CHILDREN_SINGLE_COL_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun KProperty>.children(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = - columnGroup(this).ensureIsColumnGroup().colsInternal(predicate) - - @Deprecated( - COL_SELECT_DSL_CHILDREN_SINGLE_COL, - ReplaceWith(COL_SELECT_DSL_CHILDREN_SINGLE_COL_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun ColumnPath.children(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = - columnGroup(this).ensureIsColumnGroup().colsInternal(predicate) - - // endregion } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt index 75f35f363e..97ddc798cb 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt @@ -24,8 +24,6 @@ import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.columns.changePath import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_SELECT_COLS -import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_SELECT_COLS_REPLACE import kotlin.reflect.KProperty // region DataFrame @@ -215,34 +213,6 @@ public interface SelectColumnsSelectionDsl { * `df.`[select][DataFrame.select]` { `[pathOf][pathOf]`("pathTo", "myColGroup")`[`() {`][ColumnPath.select]` someCol `[and][ColumnsSelectionDsl.and]` `[colsOf][SingleColumn.colsOf]`<`[String][String]`>() `[`}`][ColumnPath.select]` }` */ public fun ColumnPath.select(selector: ColumnsSelector<*, R>): ColumnSet = columnGroup(this).select(selector) - - // region deprecated - - @Deprecated( - message = COL_SELECT_DSL_SELECT_COLS, - replaceWith = ReplaceWith(COL_SELECT_DSL_SELECT_COLS_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.select(vararg columns: String): ColumnSet<*> = - selectInternal { columns.toColumnSet() } - - @Deprecated( - message = COL_SELECT_DSL_SELECT_COLS, - replaceWith = ReplaceWith(COL_SELECT_DSL_SELECT_COLS_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.select(vararg columns: ColumnReference): ColumnSet = - selectInternal { columns.toColumnSet() } - - @Deprecated( - message = COL_SELECT_DSL_SELECT_COLS, - replaceWith = ReplaceWith(COL_SELECT_DSL_SELECT_COLS_REPLACE), - level = DeprecationLevel.ERROR, - ) - public fun SingleColumn>.select(vararg columns: KProperty): ColumnSet = - selectInternal { columns.toColumnSet() } - - // endregion } internal fun SingleColumn>.selectInternal(selector: ColumnsSelector): ColumnSet = diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/simplify.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/simplify.kt index b8bf1ce408..770b2c267c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/simplify.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/simplify.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.simplify import org.jetbrains.kotlinx.dataframe.impl.columns.transform -import org.jetbrains.kotlinx.dataframe.util.TOP_MESSAGE // region ColumnsSelectionDsl @@ -64,13 +63,6 @@ public interface SimplifyColumnsSelectionDsl { */ @Suppress("UNCHECKED_CAST") public fun ColumnSet.simplify(): ColumnSet = simplifyInternal() as ColumnSet - - // region deprecated - - @Deprecated(TOP_MESSAGE, ReplaceWith("simplify()"), DeprecationLevel.ERROR) - public fun ColumnSet.roots(): ColumnSet = simplify() - - // endregion } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/ColumnWithPath.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/ColumnWithPath.kt index 56f6bfa2a6..1ed1c1a6ea 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/ColumnWithPath.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/ColumnWithPath.kt @@ -6,7 +6,6 @@ import org.jetbrains.kotlinx.dataframe.api.isColumnGroup import org.jetbrains.kotlinx.dataframe.impl.columns.addParentPath import org.jetbrains.kotlinx.dataframe.impl.columns.addPath import org.jetbrains.kotlinx.dataframe.impl.columns.depth -import org.jetbrains.kotlinx.dataframe.util.COLUMN_WITH_PATH_MESSAGE import kotlin.reflect.KProperty public interface ColumnWithPath : DataColumn { @@ -59,45 +58,6 @@ public interface ColumnWithPath : DataColumn { override fun path(): ColumnPath = path override fun rename(newName: String): ColumnWithPath - - // region deprecated - - @Deprecated( - message = COLUMN_WITH_PATH_MESSAGE, - replaceWith = ReplaceWith("getCol(accessor)"), - level = DeprecationLevel.ERROR, - ) - public fun getChild(accessor: ColumnReference): ColumnWithPath? = getCol(accessor) - - @Deprecated( - message = COLUMN_WITH_PATH_MESSAGE, - replaceWith = ReplaceWith("getCol(name)"), - level = DeprecationLevel.ERROR, - ) - public fun getChild(name: String): ColumnWithPath? = getCol(name) - - @Deprecated( - message = COLUMN_WITH_PATH_MESSAGE, - replaceWith = ReplaceWith("getCol(index)"), - level = DeprecationLevel.ERROR, - ) - public fun getChild(index: Int): ColumnWithPath? = getCol(index) - - @Deprecated( - message = COLUMN_WITH_PATH_MESSAGE, - replaceWith = ReplaceWith("getCol(accessor)"), - level = DeprecationLevel.ERROR, - ) - public fun getChild(accessor: KProperty): ColumnWithPath? = getCol(accessor) - - @Deprecated( - message = COLUMN_WITH_PATH_MESSAGE, - replaceWith = ReplaceWith("cols()"), - level = DeprecationLevel.ERROR, - ) - public fun children(): List> = cols() - - // endregion } public val ColumnWithPath.depth: Int get() = path.depth() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt index 991d0e497f..79a96910d7 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt @@ -7,71 +7,6 @@ package org.jetbrains.kotlinx.dataframe.util * Level.ERROR -> Remove */ -// region WARNING in 0.13, ERROR in 0.14 - -private const val MESSAGE_0_14 = "Will be removed in 0.14." - -internal const val COLUMN_WITH_PATH_MESSAGE = "`child` references are replaced with `col`. $MESSAGE_0_14" - -internal const val COLS_SELECT_DSL_GROUP = "Use `colGroups` instead. $MESSAGE_0_14" -internal const val COLS_SELECT_DSL_GROUP_REPLACE = "this.colGroups(filter)" - -internal const val COL_SELECT_DSL_ALL_COLS = "Use `allCols()` instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_ALL_COLS_REPLACE = "this.allCols()" - -internal const val COL_SELECT_DSL_ALL_COLS_AFTER = "Use `allColsAfter()` instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE = "this.allColsAfter(column)" - -internal const val COL_SELECT_DSL_ALL_COLS_BEFORE = "Use `allColsBefore()` instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE = "this.allColsBefore(column)" - -internal const val COL_SELECT_DSL_ALL_FROM = "Use `allFrom()` instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_ALL_FROM_REPLACE = "this.allFrom(column)" - -internal const val COL_SELECT_DSL_ALL_COLS_FROM = "Use `allColsFrom()` instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_ALL_COLS_FROM_REPLACE = "this.allColsFrom(column)" - -internal const val COL_SELECT_DSL_ALL_UP_TO = "Use `allUpTo()` instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_ALL_UP_TO_REPLACE = "this.allUpTo(column)" - -internal const val COL_SELECT_DSL_ALL_COLS_UP_TO = "Use `allColsUpTo()` instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE = "this.allColsUpTo(column)" - -internal const val COL_SELECT_DSL_AT_ANY_DEPTH = - "This postfix notation is now deprecated. Use `colsAtAnyDepth().YOUR_OPERATION` instead (NOTE: ReplaceWith is incorrect). $MESSAGE_0_14" - -// TODO https://youtrack.jetbrains.com/issue/KTIJ-27052/ReplaceWith-Deprecated-this-after-call-bug -internal const val COL_SELECT_DSL_AT_ANY_DEPTH_REPLACE = "this" - -internal const val COL_SELECT_DSL_CHILDREN = "Use colsInGroups {} instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_CHILDREN_REPLACE = "this.colsInGroups(predicate)" - -internal const val COL_SELECT_DSL_CHILDREN_SINGLE_COL = "Use cols {} instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_CHILDREN_SINGLE_COL_REPLACE = "this.cols(predicate)" - -internal const val TOP_MESSAGE = "top is deprecated, use simplify() instead. $MESSAGE_0_14" - -internal const val COL_SELECT_DSL_LIST_DATACOLUMN_GET = - "This function is deprecated. Use `.toColumnSet()[]` instead. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_LIST_DATACOLUMN_GET_REPLACE = "this.toColumnSet()[range]" - -internal const val COL_SELECT_DSL_SELECT_COLS = - "Nested select is reserved for ColumnsSelector/ColumnsSelectionDsl behavior. Use myGroup.cols() to select columns by name from a ColumnGroup. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_SELECT_COLS_REPLACE = "this.cols(*columns)" - -internal const val COL_SELECT_DSL_SINGLE_COL_EXCEPT = "This function is replaced with allColsExcept. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_SELECTOR = "this.allColsExcept(selector)" -internal const val COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_RESOLVERS = "this.allColsExcept { others.toColumnSet() }" -internal const val COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_RESOLVER = "this.allColsExcept { other }" -internal const val COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHERS = "this.allColsExcept(*others)" -internal const val COL_SELECT_DSL_SINGLE_COL_EXCEPT_REPLACE_OTHER = "this.allColsExcept(other)" - -internal const val COL_SELECT_DSL_EXCEPT = "This function is replaced with allExcept. $MESSAGE_0_14" -internal const val COL_SELECT_DSL_EXCEPT_REPLACE_SELECTOR = "this.allExcept(selector)" -internal const val COL_SELECT_DSL_EXCEPT_REPLACE_RESOLVER = "this.allExcept(*others)" - -// endregion - // region WARNING in 0.14, ERROR in 0.15 private const val MESSAGE_0_15 = "Will be removed in 0.15." @@ -84,6 +19,12 @@ private const val MESSAGE_0_16 = "Will be removed in 0.16." // endregion +// region WARNING in 0.16, ERROR in 0.17 + +private const val MESSAGE_0_17 = "Will be removed in 0.17." + +// endregion + // region keep across releases internal const val IDENTITY_FUNCTION = "This overload is an identity function and can be omitted." From d68caeae98807a9aa79c2d13e964de4733465e72 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 25 Sep 2024 12:47:54 +0200 Subject: [PATCH 4/4] bump docs version and bootstrap version to 0.14.1 --- README.md | 10 +++++----- docs/StardustDocs/v.list | 2 +- gradle/libs.versions.toml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cef28a4b21..cc02fbb59e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ You could find the following articles there: * [Rendering to HTML](https://kotlin.github.io/dataframe/tohtml.html#jupyter-notebooks) ### What's new -Check out this [notebook with new features](examples/notebooks/feature_overviews/0.14.0/new_features.ipynb) in development for the next release. +Check out this [notebook with new features](examples/notebooks/feature_overviews/0.14.1/new_features.ipynb) in development for the next release. The DataFrame compiler plugin has reached public preview! Here's a [compiler plugin demo project](https://github.com/koperagen/df-plugin-demo) that works with [IntelliJ IDEA](https://www.jetbrains.com/idea/) 2024.2. @@ -46,13 +46,13 @@ Here's a [compiler plugin demo project](https://github.com/koperagen/df-plugin-d ## Setup ```kotlin -implementation("org.jetbrains.kotlinx:dataframe:0.14.0") +implementation("org.jetbrains.kotlinx:dataframe:0.14.1") ``` Optional Gradle plugin for enhanced type safety and schema generation https://kotlin.github.io/dataframe/schemasgradle.html ```kotlin -id("org.jetbrains.kotlinx.dataframe") version "0.14.0" +id("org.jetbrains.kotlinx.dataframe") version "0.14.1" ``` Check out the [custom setup page](https://kotlin.github.io/dataframe/gettingstartedgradleadvanced.html) if you don't need some of the formats as dependencies, @@ -77,7 +77,7 @@ df.filter { "stargazers_count"() > 50 }.print() Requires Gradle plugin to work ```kotlin -id("org.jetbrains.kotlinx.dataframe") version "0.14.0" +id("org.jetbrains.kotlinx.dataframe") version "0.14.1" ``` Plugin generates extension properties API for provided sample of data. Column names and their types become discoverable in completion. @@ -228,7 +228,7 @@ This table shows the mapping between main library component versions and minimum | 0.12.0 | 8 | 1.9.0 | 0.11.0-358 | 3.0.0 | 11.0.0 | | 0.12.1 | 8 | 1.9.0 | 0.11.0-358 | 3.0.0 | 11.0.0 | | 0.13.1 | 8 | 1.9.22 | 0.12.0-139 | 3.0.0 | 15.0.0 | -| 0.14.0 | 8 | 2.0.20 | 0.12.0-139 | 3.0.0 | 17.0.0 | +| 0.14.1 | 8 | 2.0.20 | 0.12.0-139 | 3.0.0 | 17.0.0 | ## Code of Conduct diff --git a/docs/StardustDocs/v.list b/docs/StardustDocs/v.list index 75de6809a4..957e48f371 100644 --- a/docs/StardustDocs/v.list +++ b/docs/StardustDocs/v.list @@ -1,5 +1,5 @@ - + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9f6e3ec147..4be1812d3d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ libsPublisher = "1.9.23-dev-45" # "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs, # dogfood Gradle / KSP plugins in tests and idea-examples modules -dataframe = "0.14.0" +dataframe = "0.14.1" korro = "0.1.6" kover = "0.8.3"