diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f57c2e5bcd..b9ca9e0a8f 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.12' + CONFIG_JSON_VERSION: '0.13' jobs: build-job: diff --git a/README.md b/README.md index 3bf6653f46..556cce6aaf 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.8.20-blue.svg?logo=kotlin)](http://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-1.9.22-blue.svg?logo=kotlin)](http://kotlinlang.org) [![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/dataframe?color=blue&label=Maven%20Central)](https://search.maven.org/artifact/org.jetbrains.kotlinx/dataframe) [![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/Kotlin/dataframe/HEAD) @@ -38,13 +38,13 @@ You could find the following articles there: ## Setup ```kotlin -implementation("org.jetbrains.kotlinx:dataframe:0.12.1") +implementation("org.jetbrains.kotlinx:dataframe:0.13.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.12.1" +id("org.jetbrains.kotlinx.dataframe") version "0.13.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, @@ -69,7 +69,7 @@ df.filter { "stargazers_count"() > 50 }.print() Requires Gradle plugin to work ```kotlin -id("org.jetbrains.kotlinx.dataframe") version "0.12.1" +id("org.jetbrains.kotlinx.dataframe") version "0.13.1" ``` Plugin generates extension properties API for provided sample of data. Column names and their types become discoverable in completion. @@ -219,7 +219,7 @@ This table shows the mapping between main library component versions and minimum | 0.11.1 | 8 | 1.8.20 | 0.11.0-358 | 3.0.0 | 11.0.0 | | 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 | ## Code of Conduct diff --git a/RELEASE_CHECK_LIST.md b/RELEASE_CHECK_LIST.md index c6d8352d49..dd95ecafd5 100644 --- a/RELEASE_CHECK_LIST.md +++ b/RELEASE_CHECK_LIST.md @@ -23,16 +23,17 @@ - Check on Datalore with a test project (TODO: add link). - Check for Android with a test project (TODO: add link). - Check for ServerSide with a test project (TODO: add link). -15. Publish Documentation from [GitHub Action](https://github.com/Kotlin/dataframe/actions/workflows/main.yml) -16. Prepare and publish the Release Notes. **RC** -17. Create a Release from the release tag on GitHub. **RC** -18. Update a KDF version in the [Kotlin Jupyter Descriptor](https://github.com/Kotlin/kotlin-jupyter-libraries/blob/master/dataframe.json). Now the Renovate bot does this. -19. Update the DataFrame version in the `gradle.properties` file for the next release cycle (i.e. 0.10.0 -> 0.11.0) -20. Update deprecated functions in [deprecationMessages.kt](/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt) +15. Run `./gradlew korro` to update the code snippets for the docs. +16. Publish Documentation from [GitHub Action](https://github.com/Kotlin/dataframe/actions/workflows/main.yml) +17. Prepare and publish the Release Notes. **RC** +18. Create a Release from the release tag on GitHub. **RC** +19. Update a KDF version in the [Kotlin Jupyter Descriptor](https://github.com/Kotlin/kotlin-jupyter-libraries/blob/master/dataframe.json). Now the Renovate bot does this. +20. Update the DataFrame version in the `gradle.properties` file for the next release cycle (i.e. 0.10.0 -> 0.11.0) +21. Update deprecated functions in [deprecationMessages.kt](/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt) such that - `Level.WARNING` messages are changed to `Level.ERROR` - `Level.ERROR` messages and their functions are removed. - Update regions in the file accordingly. -21. Update Notebook examples, both in the project and on Datalore. +22. Update Notebook examples, both in the project and on Datalore. (Activities that need to be done for **R**elease **C**andidate releases are marked as such) diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt index 8b4074df0e..a41a423003 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt @@ -874,7 +874,7 @@ class Access : TestBase() { // SampleStart // by condition df.select { cols { it.name().startsWith("year") } } - df.select { startsWith("year") } + df.select { nameStartsWith("year") } // by type df.select { colsOf() } @@ -919,7 +919,7 @@ class Access : TestBase() { df.select { colsAtAnyDepth().colsOf() } // all columns except given column set - df.select { except { colsOf() } } + df.select { allExcept { colsOf() } } // union of column sets df.select { take(2) and col(3) } diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/ApiLevels.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/ApiLevels.kt index 3d7bd94cd7..f37615b632 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/ApiLevels.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/ApiLevels.kt @@ -112,7 +112,7 @@ class ApiLevels { ) val passengers = DataFrame.read("titanic.csv") - .filter { it.get(Passenger::city).endsWith("NY") } + .filter { it[Passenger::city].endsWith("NY") } .toListOf() // SampleEnd } diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/JoinWith.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/JoinWith.kt index bb9e0e3209..add7b1c340 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/JoinWith.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/JoinWith.kt @@ -104,7 +104,7 @@ class JoinWith : TestBase() { } } - private fun AnyFrame.uwrapColoredValues(): AnyFrame { + private fun AnyFrame.unwrapColoredValues(): AnyFrame { return convert { colsAtAnyDepth().colsOf?>() }.with(Infer.Type) { it?.value } } @@ -171,9 +171,9 @@ class JoinWith : TestBase() { } private fun snippetOutput(coloredResult: DataFrame, result: DataFrame) { - coloredCampaigns.uwrapColoredValues() shouldBe campaigns - coloredVisits.uwrapColoredValues() shouldBe visits - coloredResult.uwrapColoredValues() shouldBe result + coloredCampaigns.unwrapColoredValues() shouldBe campaigns + coloredVisits.unwrapColoredValues() shouldBe visits + coloredResult.unwrapColoredValues() shouldBe result PluginCallbackProxy.overrideHtmlOutput( manualOutput = DataFrameHtmlData.tableDefinitions() diff --git a/docs/StardustDocs/project.ihp b/docs/StardustDocs/project.ihp index f773949548..8dd53cdf2a 100644 --- a/docs/StardustDocs/project.ihp +++ b/docs/StardustDocs/project.ihp @@ -4,10 +4,10 @@ - - + + - + diff --git a/docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html b/docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html index bf37a1b609..ae70f1de1a 100644 --- a/docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html +++ b/docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html @@ -209,7 +209,7 @@
- df.select { startsWith("year") } + df.select { nameStartsWith("year") }
Input DataFrame: rowsCount = 7, columnsCount = 6
@@ -453,7 +453,7 @@

- df.select { except { colsOf<String>() } } + df.select { allExcept { colsOf<String>() } }
Input DataFrame: rowsCount = 7, columnsCount = 6
diff --git a/docs/StardustDocs/topics/ColumnSelectors.md b/docs/StardustDocs/topics/ColumnSelectors.md index fefb784d44..9555781d74 100644 --- a/docs/StardustDocs/topics/ColumnSelectors.md +++ b/docs/StardustDocs/topics/ColumnSelectors.md @@ -155,7 +155,7 @@ df.select { cols(1..4) } ```kotlin // by condition df.select { cols { it.name().startsWith("year") } } -df.select { startsWith("year") } +df.select { nameStartsWith("year") } // by type df.select { colsOf() } @@ -200,7 +200,7 @@ df.select { colsAtAnyDepth { it.name().contains(":") } } df.select { colsAtAnyDepth().colsOf() } // all columns except given column set -df.select { except { colsOf() } } +df.select { allExcept { colsOf() } } // union of column sets df.select { take(2) and col(3) } diff --git a/docs/StardustDocs/topics/KPropertiesApi.md b/docs/StardustDocs/topics/KPropertiesApi.md index d3b3549077..14949e1d81 100644 --- a/docs/StardustDocs/topics/KPropertiesApi.md +++ b/docs/StardustDocs/topics/KPropertiesApi.md @@ -43,7 +43,7 @@ data class Passenger( ) val passengers = DataFrame.read("titanic.csv") - .filter { it.get(Passenger::city).endsWith("NY") } + .filter { it[Passenger::city].endsWith("NY") } .toListOf() ``` diff --git a/docs/StardustDocs/v.list b/docs/StardustDocs/v.list index 83d2669fae..a0056e5a39 100644 --- a/docs/StardustDocs/v.list +++ b/docs/StardustDocs/v.list @@ -1,5 +1,5 @@ - + diff --git a/gradle.properties b/gradle.properties index b4a416c5ba..69b3c03b72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ projectName=dataframe -version=0.13.1 +version=0.13.2 jupyterApiTCRepo= kotlin.jupyter.add.scanner=false org.gradle.jvmargs=-Xmx4G diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1024ae35ee..03955e860f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ libsPublisher = "1.8.10-dev-43" # "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.13.1-RC1" +dataframe = "0.13.1" # TODO 0.1.6 breaks ktlint, https://github.com/Kotlin/dataframe/issues/598 korro = "0.1.5"