Skip to content

Commit 39c9c3b

Browse files
committed
Merge branch 'refs/heads/master' into kdoc-fixes
# Conflicts: # core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt
2 parents 0a388b7 + 4ec98c4 commit 39c9c3b

File tree

61 files changed

+405
-902
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+405
-902
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
ALGOLIA_INDEX_NAME: prod_DATAFRAME_HELP
1818
ALGOLIA_KEY: ${{ secrets.ALGOLIA_KEY }}
1919
CONFIG_JSON_PRODUCT: Dataframe
20-
CONFIG_JSON_VERSION: '0.12'
20+
CONFIG_JSON_VERSION: '0.13'
2121

2222
jobs:
2323
build-job:

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Kotlin Dataframe: typesafe in-memory structured data processing for JVM
22
[![JetBrains incubator project](https://jb.gg/badges/incubator.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
33
[![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)
4-
[![Kotlin](https://img.shields.io/badge/kotlin-1.8.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
5-
[![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)
4+
[![Kotlin](https://img.shields.io/badge/kotlin-1.9.22-blue.svg?logo=kotlin)](http://kotlinlang.org)
5+
[![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)
6+
[![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
7+
)](https://search.maven.org/artifact/org.jetbrains.kotlinx/dataframe)
68
[![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
79
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/Kotlin/dataframe/HEAD)
810

@@ -38,13 +40,13 @@ You could find the following articles there:
3840
## Setup
3941

4042
```kotlin
41-
implementation("org.jetbrains.kotlinx:dataframe:0.12.1")
43+
implementation("org.jetbrains.kotlinx:dataframe:0.13.1")
4244
```
4345

4446
Optional Gradle plugin for enhanced type safety and schema generation
4547
https://kotlin.github.io/dataframe/schemasgradle.html
4648
```kotlin
47-
id("org.jetbrains.kotlinx.dataframe") version "0.12.1"
49+
id("org.jetbrains.kotlinx.dataframe") version "0.13.1"
4850
```
4951

5052
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 +71,7 @@ df.filter { "stargazers_count"<Int>() > 50 }.print()
6971

7072
Requires Gradle plugin to work
7173
```kotlin
72-
id("org.jetbrains.kotlinx.dataframe") version "0.12.1"
74+
id("org.jetbrains.kotlinx.dataframe") version "0.13.1"
7375
```
7476

7577
Plugin generates extension properties API for provided sample of data. Column names and their types become discoverable in completion.
@@ -219,7 +221,7 @@ This table shows the mapping between main library component versions and minimum
219221
| 0.11.1 | 8 | 1.8.20 | 0.11.0-358 | 3.0.0 | 11.0.0 |
220222
| 0.12.0 | 8 | 1.9.0 | 0.11.0-358 | 3.0.0 | 11.0.0 |
221223
| 0.12.1 | 8 | 1.9.0 | 0.11.0-358 | 3.0.0 | 11.0.0 |
222-
224+
| 0.13.1 | 8 | 1.9.22 | 0.12.0-139 | 3.0.0 | 15.0.0 |
223225

224226
## Code of Conduct
225227

RELEASE_CHECK_LIST.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@
2323
- Check on Datalore with a test project (TODO: add link).
2424
- Check for Android with a test project (TODO: add link).
2525
- Check for ServerSide with a test project (TODO: add link).
26-
15. Publish Documentation from [GitHub Action](https://github.com/Kotlin/dataframe/actions/workflows/main.yml)
27-
16. Prepare and publish the Release Notes. **RC**
28-
17. Create a Release from the release tag on GitHub. **RC**
29-
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.
30-
19. Update the DataFrame version in the `gradle.properties` file for the next release cycle (i.e. 0.10.0 -> 0.11.0)
31-
20. Update deprecated functions in [deprecationMessages.kt](/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt)
26+
15. Run `./gradlew korro` to update the code snippets for the docs.
27+
16. Publish Documentation from [GitHub Action](https://github.com/Kotlin/dataframe/actions/workflows/main.yml)
28+
17. Prepare and publish the Release Notes. **RC**
29+
18. Create a Release from the release tag on GitHub. **RC**
30+
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.
31+
20. Update the DataFrame version in the `gradle.properties` file for the next release cycle (i.e. 0.10.0 -> 0.11.0)
32+
21. Update deprecated functions in [deprecationMessages.kt](/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt)
3233
such that
3334
- `Level.WARNING` messages are changed to `Level.ERROR`
3435
- `Level.ERROR` messages and their functions are removed.
3536
- Update regions in the file accordingly.
36-
21. Update Notebook examples, both in the project and on Datalore.
37+
22. Update Notebook examples, both in the project and on Datalore.
3738

3839
(Activities that need to be done for **R**elease **C**andidate releases are marked as such)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ public interface ColumnsSelectionDsl<out T> : /* SingleColumn<DataRow<T>> */
441441
@Deprecated(
442442
message = COL_SELECT_DSL_LIST_DATACOLUMN_GET,
443443
replaceWith = ReplaceWith(COL_SELECT_DSL_LIST_DATACOLUMN_GET_REPLACE),
444-
level = DeprecationLevel.WARNING,
444+
level = DeprecationLevel.ERROR,
445445
)
446446
public operator fun <C> List<DataColumn<C>>.get(range: IntRange): ColumnSet<C> =
447447
ColumnsList(subList(range.first, range.last + 1))

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

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ import org.jetbrains.kotlinx.dataframe.index
1515
import org.jetbrains.kotlinx.dataframe.indices
1616
import org.jetbrains.kotlinx.dataframe.ncol
1717
import org.jetbrains.kotlinx.dataframe.nrow
18-
import org.jetbrains.kotlinx.dataframe.util.DIFF_DEPRECATION_MESSAGE
19-
import org.jetbrains.kotlinx.dataframe.util.DIFF_OR_NULL_IMPORT
20-
import org.jetbrains.kotlinx.dataframe.util.DIFF_REPLACE_MESSAGE
2118
import kotlin.experimental.ExperimentalTypeInference
2219
import kotlin.reflect.KProperty
2320
import kotlin.reflect.KType
@@ -162,40 +159,6 @@ public fun <T> DataRow<T>.diffOrNull(expression: RowExpression<T, Long>): Long?
162159
public fun <T> DataRow<T>.diffOrNull(expression: RowExpression<T, Float>): Float? =
163160
prev()?.let { p -> expression(this, this) - expression(p, p) }
164161

165-
@OptIn(ExperimentalTypeInference::class)
166-
@OverloadResolutionByLambdaReturnType
167-
@Deprecated(
168-
DIFF_DEPRECATION_MESSAGE,
169-
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
170-
DeprecationLevel.ERROR,
171-
)
172-
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Double>): Double? =
173-
prev()?.let { p -> expression(this, this) - expression(p, p) }
174-
175-
@Deprecated(
176-
DIFF_DEPRECATION_MESSAGE,
177-
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
178-
DeprecationLevel.ERROR,
179-
)
180-
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Int>): Int? =
181-
prev()?.let { p -> expression(this, this) - expression(p, p) }
182-
183-
@Deprecated(
184-
DIFF_DEPRECATION_MESSAGE,
185-
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
186-
DeprecationLevel.ERROR,
187-
)
188-
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Long>): Long? =
189-
prev()?.let { p -> expression(this, this) - expression(p, p) }
190-
191-
@Deprecated(
192-
DIFF_DEPRECATION_MESSAGE,
193-
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
194-
DeprecationLevel.ERROR,
195-
)
196-
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Float>): Float? =
197-
prev()?.let { p -> expression(this, this) - expression(p, p) }
198-
199162
public fun AnyRow.columnsCount(): Int = df().ncol
200163

201164
public fun AnyRow.columnNames(): List<String> = df().columnNames()

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

Lines changed: 76 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8471,64 +8471,120 @@ public interface AllColumnsSelectionDsl {
84718471

84728472
// region deprecated
84738473

8474-
@Deprecated(COL_SELECT_DSL_ALL_COLS, ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE))
8474+
@Deprecated(
8475+
COL_SELECT_DSL_ALL_COLS,
8476+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE),
8477+
level = DeprecationLevel.ERROR
8478+
)
84758479
public fun SingleColumn<DataRow<*>>.all(): TransformableColumnSet<*> = allCols()
84768480

8477-
@Deprecated(COL_SELECT_DSL_ALL_COLS, ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE))
8481+
@Deprecated(
8482+
COL_SELECT_DSL_ALL_COLS,
8483+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE),
8484+
level = DeprecationLevel.ERROR
8485+
)
84788486
public fun String.all(): TransformableColumnSet<*> = allCols()
84798487

8480-
@Deprecated(COL_SELECT_DSL_ALL_COLS_AFTER, ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE))
8488+
@Deprecated(
8489+
COL_SELECT_DSL_ALL_COLS_AFTER,
8490+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
8491+
level = DeprecationLevel.ERROR
8492+
)
84818493
public fun SingleColumn<DataRow<*>>.allAfter(column: ColumnPath): ColumnSet<*> = allColsAfter(column)
84828494

8483-
@Deprecated(COL_SELECT_DSL_ALL_COLS_AFTER, ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE))
8495+
@Deprecated(
8496+
COL_SELECT_DSL_ALL_COLS_AFTER,
8497+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
8498+
level = DeprecationLevel.ERROR
8499+
)
84848500
public fun SingleColumn<DataRow<*>>.allAfter(column: String): ColumnSet<*> = allColsAfter(column)
84858501

8486-
@Deprecated(COL_SELECT_DSL_ALL_COLS_AFTER, ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE))
8502+
@Deprecated(
8503+
COL_SELECT_DSL_ALL_COLS_AFTER,
8504+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
8505+
level = DeprecationLevel.ERROR
8506+
)
84878507
public fun SingleColumn<DataRow<*>>.allAfter(column: AnyColumnReference): ColumnSet<*> = allColsAfter(column)
84888508

8489-
@Deprecated(COL_SELECT_DSL_ALL_COLS_BEFORE, ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE))
8509+
@Deprecated(
8510+
COL_SELECT_DSL_ALL_COLS_BEFORE,
8511+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
8512+
level = DeprecationLevel.ERROR
8513+
)
84908514
public fun SingleColumn<DataRow<*>>.allBefore(column: ColumnPath): ColumnSet<*> = allColsBefore(column)
84918515

8492-
@Deprecated(COL_SELECT_DSL_ALL_COLS_BEFORE, ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE))
8516+
@Deprecated(
8517+
COL_SELECT_DSL_ALL_COLS_BEFORE,
8518+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
8519+
level = DeprecationLevel.ERROR
8520+
)
84938521
public fun SingleColumn<DataRow<*>>.allBefore(column: String): ColumnSet<*> = allColsBefore(column)
84948522

8495-
@Deprecated(COL_SELECT_DSL_ALL_COLS_BEFORE, ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE))
8523+
@Deprecated(
8524+
COL_SELECT_DSL_ALL_COLS_BEFORE,
8525+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
8526+
level = DeprecationLevel.ERROR
8527+
)
84968528
public fun SingleColumn<DataRow<*>>.allBefore(column: AnyColumnReference): ColumnSet<*> = allColsBefore(column)
84978529

8498-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE))
8530+
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
84998531
public fun ColumnsSelectionDsl<*>.allSince(column: ColumnPath): ColumnSet<*> = allFrom(column)
85008532

8501-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE))
8533+
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
85028534
public fun ColumnsSelectionDsl<*>.allSince(column: String): ColumnSet<*> = allFrom(column)
85038535

8504-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE))
8536+
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
85058537
public fun ColumnsSelectionDsl<*>.allSince(column: AnyColumnReference): ColumnSet<*> = allFrom(column)
85068538

8507-
@Deprecated(COL_SELECT_DSL_ALL_COLS_FROM, ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE))
8539+
@Deprecated(
8540+
COL_SELECT_DSL_ALL_COLS_FROM,
8541+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
8542+
level = DeprecationLevel.ERROR
8543+
)
85088544
public fun SingleColumn<DataRow<*>>.allSince(column: ColumnPath): ColumnSet<*> = allColsFrom(column)
85098545

8510-
@Deprecated(COL_SELECT_DSL_ALL_COLS_FROM, ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE))
8546+
@Deprecated(
8547+
COL_SELECT_DSL_ALL_COLS_FROM,
8548+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
8549+
level = DeprecationLevel.ERROR
8550+
)
85118551
public fun SingleColumn<DataRow<*>>.allSince(column: String): ColumnSet<*> = allColsFrom(column)
85128552

8513-
@Deprecated(COL_SELECT_DSL_ALL_COLS_FROM, ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE))
8553+
@Deprecated(
8554+
COL_SELECT_DSL_ALL_COLS_FROM,
8555+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
8556+
level = DeprecationLevel.ERROR
8557+
)
85148558
public fun SingleColumn<DataRow<*>>.allSince(column: AnyColumnReference): ColumnSet<*> = allColsFrom(column)
85158559

8516-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE))
8560+
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
85178561
public fun ColumnsSelectionDsl<*>.allUntil(column: ColumnPath): ColumnSet<*> = allUpTo(column)
85188562

8519-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE))
8563+
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
85208564
public fun ColumnsSelectionDsl<*>.allUntil(column: String): ColumnSet<*> = allUpTo(column)
85218565

8522-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE))
8566+
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
85238567
public fun ColumnsSelectionDsl<*>.allUntil(column: AnyColumnReference): ColumnSet<*> = allUpTo(column)
85248568

8525-
@Deprecated(COL_SELECT_DSL_ALL_COLS_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE))
8569+
@Deprecated(
8570+
COL_SELECT_DSL_ALL_COLS_UP_TO,
8571+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
8572+
level = DeprecationLevel.ERROR
8573+
)
85268574
public fun SingleColumn<DataRow<*>>.allUntil(column: ColumnPath): ColumnSet<*> = allColsUpTo(column)
85278575

8528-
@Deprecated(COL_SELECT_DSL_ALL_COLS_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE))
8576+
@Deprecated(
8577+
COL_SELECT_DSL_ALL_COLS_UP_TO,
8578+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
8579+
level = DeprecationLevel.ERROR
8580+
)
85298581
public fun SingleColumn<DataRow<*>>.allUntil(column: String): ColumnSet<*> = allColsUpTo(column)
85308582

8531-
@Deprecated(COL_SELECT_DSL_ALL_COLS_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE))
8583+
@Deprecated(
8584+
COL_SELECT_DSL_ALL_COLS_UP_TO,
8585+
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
8586+
level = DeprecationLevel.ERROR
8587+
)
85328588
public fun SingleColumn<DataRow<*>>.allUntil(column: AnyColumnReference): ColumnSet<*> = allColsUpTo(column)
85338589

85348590
// endregion

0 commit comments

Comments
 (0)