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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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,
Expand All @@ -69,7 +69,7 @@ df.filter { "stargazers_count"<Int>() > 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.
Expand Down Expand Up @@ -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

Expand Down
15 changes: 8 additions & 7 deletions RELEASE_CHECK_LIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>() }
Expand Down Expand Up @@ -919,7 +919,7 @@ class Access : TestBase() {
df.select { colsAtAnyDepth().colsOf<String>() }

// all columns except given column set
df.select { except { colsOf<String>() } }
df.select { allExcept { colsOf<String>() } }

// union of column sets
df.select { take(2) and col(3) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Passenger>()
// SampleEnd
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class JoinWith : TestBase() {
}
}

private fun AnyFrame.uwrapColoredValues(): AnyFrame {
private fun AnyFrame.unwrapColoredValues(): AnyFrame {
return convert { colsAtAnyDepth().colsOf<ColoredValue<*>?>() }.with(Infer.Type) { it?.value }
}

Expand Down Expand Up @@ -171,9 +171,9 @@ class JoinWith : TestBase() {
}

private fun snippetOutput(coloredResult: DataFrame<Any?>, result: DataFrame<Any?>) {
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()
Expand Down
6 changes: 3 additions & 3 deletions docs/StardustDocs/project.ihp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<ihp version="2.0">
<categories src="c.list"/>
<topics dir="topics"/>
<images dir="images" version="0.12" web-path="images/" />
<snippets dir="snippets" version="0.12" web-path="snippets/" />
<images dir="images" version="0.13" web-path="images/" />
<snippets dir="snippets" version="0.13" web-path="snippets/" />
<vars src="v.list"/>
<instance src="d.tree" version="0.12" id="dataframe"/>
<instance src="d.tree" version="0.13" id="dataframe"/>
<settings>
<default-property element-name="chapter" property-name="show-structure-depth" value="2"/>
</settings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
</details>
<br>
<details>
<summary>df.select { startsWith(&quot;year&quot;) }</summary>
<summary>df.select { nameStartsWith(&quot;year&quot;) }</summary>
<details>
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
<table class="dataframe" id="df_4"></table>
Expand Down Expand Up @@ -453,7 +453,7 @@
</details>
<br>
<details>
<summary>df.select { except { colsOf&amp;lt;String&amp;gt;() } }</summary>
<summary>df.select { allExcept { colsOf&amp;lt;String&amp;gt;() } }</summary>
<details>
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
<table class="dataframe" id="df_34"></table>
Expand Down
4 changes: 2 additions & 2 deletions docs/StardustDocs/topics/ColumnSelectors.md
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>() }
Expand Down Expand Up @@ -200,7 +200,7 @@ df.select { colsAtAnyDepth { it.name().contains(":") } }
df.select { colsAtAnyDepth().colsOf<String>() }

// all columns except given column set
df.select { except { colsOf<String>() } }
df.select { allExcept { colsOf<String>() } }

// union of column sets
df.select { take(2) and col(3) }
Expand Down
2 changes: 1 addition & 1 deletion docs/StardustDocs/topics/KPropertiesApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -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<Passenger>()
```

Expand Down
2 changes: 1 addition & 1 deletion docs/StardustDocs/v.list
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE vars SYSTEM "https://resources.jetbrains.com/writerside/1.0/vars.dtd">
<vars>
<var name="dataFrameVersion" value="0.12.1" type="string"/>
<var name="dataFrameVersion" value="0.13.1" type="string"/>
</vars>
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
projectName=dataframe
version=0.13.1
version=0.13.2
jupyterApiTCRepo=
kotlin.jupyter.add.scanner=false
org.gradle.jvmargs=-Xmx4G
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down