Skip to content

Commit 669baa6

Browse files
zaleslawzaleslaw
committed
Remove deprecated methods and upgrade the deprecation level and updated the documentation before release
1 parent 9a2959b commit 669baa6

File tree

39 files changed

+559
-6598
lines changed

39 files changed

+559
-6598
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.11'
20+
CONFIG_JSON_VERSION: '0.12'
2121

2222
jobs:
2323
build-job:

‎README.md‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ Explore [**documentation**](https://kotlin.github.io/dataframe/overview.html) fo
3131
plugins {
3232
// Optional Gradle plugin for enhanced type safety and schema generation
3333
// https://kotlin.github.io/dataframe/gradle.html
34-
id 'org.jetbrains.kotlinx.dataframe' version '0.11.1'
34+
id 'org.jetbrains.kotlinx.dataframe' version '0.12.0'
3535
}
3636
3737
repositories {
3838
mavenCentral()
3939
}
4040
4141
dependencies {
42-
implementation 'org.jetbrains.kotlinx:dataframe:0.11.1'
42+
implementation 'org.jetbrains.kotlinx:dataframe:0.12.0'
4343
}
4444
```
4545

@@ -49,15 +49,15 @@ dependencies {
4949
plugins {
5050
// Optional Gradle plugin for enhanced type safety and schema generation
5151
// https://kotlin.github.io/dataframe/gradle.html
52-
id("org.jetbrains.kotlinx.dataframe") version "0.11.1"
52+
id("org.jetbrains.kotlinx.dataframe") version "0.12.0"
5353
}
5454

5555
repositories {
5656
mavenCentral()
5757
}
5858

5959
dependencies {
60-
implementation("org.jetbrains.kotlinx:dataframe:0.11.1")
60+
implementation("org.jetbrains.kotlinx:dataframe:0.12.0")
6161
}
6262
```
6363

@@ -68,11 +68,11 @@ dependencies {
6868
plugins {
6969
// Optional Gradle plugin for enhanced type safety and schema generation
7070
// https://kotlin.github.io/dataframe/gradle.html
71-
id 'org.jetbrains.kotlinx.dataframe' version '0.11.1'
71+
id 'org.jetbrains.kotlinx.dataframe' version '0.12.0'
7272
}
7373
7474
dependencies {
75-
implementation 'org.jetbrains.kotlinx:dataframe:0.11.1'
75+
implementation 'org.jetbrains.kotlinx:dataframe:0.12.0'
7676
}
7777
7878
android {
@@ -116,11 +116,11 @@ tasks.withType(KotlinCompile).configureEach {
116116
plugins {
117117
// Optional Gradle plugin for enhanced type safety and schema generation
118118
// https://kotlin.github.io/dataframe/gradle.html
119-
id("org.jetbrains.kotlinx.dataframe") version "0.11.1"
119+
id("org.jetbrains.kotlinx.dataframe") version "0.12.0"
120120
}
121121

122122
dependencies {
123-
implementation("org.jetbrains.kotlinx:dataframe:0.11.1")
123+
implementation("org.jetbrains.kotlinx:dataframe:0.12.0")
124124
}
125125

126126
android {
@@ -191,6 +191,8 @@ This table shows the mapping between main library component versions and minimum
191191
| 0.10.1 | 8 | 1.8.20 | 0.11.0-358 | 3.0.0 | 11.0.0 |
192192
| 0.11.0 | 8 | 1.8.20 | 0.11.0-358 | 3.0.0 | 11.0.0 |
193193
| 0.11.1 | 8 | 1.8.20 | 0.11.0-358 | 3.0.0 | 11.0.0 |
194+
| 0.12.0 | 8 | 1.9.0 | 0.11.0-358 | 3.0.0 | 11.0.0 |
195+
194196
## Usage example
195197

196198
**Create:**

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

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,11 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
10351035
interface Arg
10361036
}
10371037

1038-
@Deprecated("Use colGroup() instead.", ReplaceWith("this.colGroup(name)"))
1038+
@Deprecated(
1039+
"Use colGroup() instead.",
1040+
ReplaceWith("this.colGroup(name)"),
1041+
level = DeprecationLevel.ERROR
1042+
)
10391043
public fun ColumnsContainer<*>.group(name: String): ColumnGroupReference = name.toColumnOf()
10401044

10411045
/**
@@ -3731,31 +3735,31 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
37313735
@Deprecated(
37323736
message = "dfs is deprecated, use recursively instead.",
37333737
replaceWith = ReplaceWith("this.cols(predicate).recursively(includeTopLevel = false)"),
3734-
level = DeprecationLevel.WARNING,
3738+
level = DeprecationLevel.ERROR,
37353739
)
37363740
public fun <C> ColumnSet<C>.dfs(predicate: (ColumnWithPath<*>) -> Boolean): ColumnSet<Any?> = dfsInternal(predicate)
37373741

37383742
@Deprecated(
37393743
message = "dfs is deprecated, use recursively instead.",
37403744
replaceWith = ReplaceWith("this.cols(predicate).recursively()"),
3741-
level = DeprecationLevel.WARNING,
3745+
level = DeprecationLevel.ERROR,
37423746
)
37433747
public fun SingleColumn<*>.dfs(predicate: (ColumnWithPath<*>) -> Boolean): ColumnSet<Any?> = dfsInternal(predicate)
37443748

37453749
@Deprecated(
37463750
message = "dfs is deprecated, use recursively instead.",
37473751
replaceWith = ReplaceWith("this.cols(predicate).recursively()"),
3748-
level = DeprecationLevel.WARNING,
3752+
level = DeprecationLevel.ERROR,
37493753
)
3750-
public fun String.dfs(predicate: (ColumnWithPath<*>) -> Boolean): ColumnSet<*> = toColumnAccessor().dfs(predicate)
3754+
public fun String.dfs(predicate: (ColumnWithPath<*>) -> Boolean): ColumnSet<*> = toColumnAccessor().cols(predicate).recursively()
37513755

37523756
@Deprecated(
37533757
message = "dfs is deprecated, use recursively instead.",
37543758
replaceWith = ReplaceWith("this.cols(predicate).recursively()"),
3755-
level = DeprecationLevel.WARNING,
3759+
level = DeprecationLevel.ERROR,
37563760
)
37573761
public fun <C> KProperty<C>.dfs(predicate: (ColumnWithPath<*>) -> Boolean): ColumnSet<*> =
3758-
toColumnAccessor().dfs(predicate)
3762+
toColumnAccessor().cols(predicate).recursively()
37593763

37603764
// endregion
37613765

@@ -3889,33 +3893,33 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
38893893
@Deprecated(
38903894
message = "allDfs is deprecated, use recursively instead.",
38913895
replaceWith = ReplaceWith("this.cols { includeGroups || !it.isColumnGroup() }.recursively()"),
3892-
level = DeprecationLevel.WARNING,
3896+
level = DeprecationLevel.ERROR,
38933897
)
38943898
public fun ColumnSet<*>.allDfs(includeGroups: Boolean = false): ColumnSet<Any?> =
3895-
if (includeGroups) dfs { true } else dfs { !it.isColumnGroup() }
3899+
if (includeGroups) cols { true }.recursively() else cols { !it.isColumnGroup() }.recursively()
38963900

38973901
@Deprecated(
38983902
message = "allDfs is deprecated, use recursively instead.",
38993903
replaceWith = ReplaceWith("this.cols { includeGroups || !it.isColumnGroup() }.recursively()"),
3900-
level = DeprecationLevel.WARNING,
3904+
level = DeprecationLevel.ERROR,
39013905
)
39023906
public fun SingleColumn<*>.allDfs(includeGroups: Boolean = false): ColumnSet<Any?> =
3903-
if (includeGroups) dfs { true } else dfs { !it.isColumnGroup() }
3907+
if (includeGroups) cols { true }.recursively() else cols { !it.isColumnGroup() }.recursively()
39043908

39053909
@Deprecated(
39063910
message = "allDfs is deprecated, use recursively instead.",
39073911
replaceWith = ReplaceWith("this.cols { includeGroups || !it.isColumnGroup() }.recursively()"),
3908-
level = DeprecationLevel.WARNING,
3912+
level = DeprecationLevel.ERROR,
39093913
)
3910-
public fun String.allDfs(includeGroups: Boolean = false): ColumnSet<Any?> = toColumnAccessor().allDfs(includeGroups)
3914+
public fun String.allDfs(includeGroups: Boolean = false): ColumnSet<Any?> = toColumnAccessor().cols { includeGroups || !it.isColumnGroup() }.recursively()
39113915

39123916
@Deprecated(
39133917
message = "allDfs is deprecated, use recursively instead.",
39143918
replaceWith = ReplaceWith("this.cols { includeGroups || !it.isColumnGroup() }.recursively()"),
3915-
level = DeprecationLevel.WARNING,
3919+
level = DeprecationLevel.ERROR,
39163920
)
39173921
public fun KProperty<*>.allDfs(includeGroups: Boolean = false): ColumnSet<Any?> =
3918-
toColumnAccessor().allDfs(includeGroups)
3922+
toColumnAccessor().cols { includeGroups || !it.isColumnGroup() }.recursively()
39193923

39203924
/**
39213925
* ## Recursively / Rec
@@ -4250,7 +4254,11 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
42504254
public fun <C> ColumnSet<C>.dropLast(n: Int = 1): ColumnSet<C> = transform { it.dropLast(n) }
42514255
public fun <C> ColumnSet<C>.takeLast(n: Int): ColumnSet<C> = transform { it.takeLast(n) }
42524256

4253-
@Deprecated("Use roots() instead", ReplaceWith("roots()"))
4257+
@Deprecated(
4258+
"Use roots() instead",
4259+
ReplaceWith("roots()"),
4260+
level = DeprecationLevel.ERROR,
4261+
)
42544262
public fun <C> ColumnSet<C>.top(): ColumnSet<C> = roots()
42554263

42564264
/**
@@ -4418,6 +4426,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
44184426
"org.jetbrains.kotlinx.dataframe.columns.recursively",
44194427
"org.jetbrains.kotlinx.dataframe.api.colsOf",
44204428
),
4429+
level = DeprecationLevel.ERROR,
44214430
)
44224431
public fun <C> String.dfsOf(type: KType, predicate: (ColumnWithPath<C>) -> Boolean = { true }): ColumnSet<*> =
44234432
toColumnAccessor().dfsOf(type, predicate)
@@ -4429,6 +4438,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
44294438
"org.jetbrains.kotlinx.dataframe.columns.recursively",
44304439
"org.jetbrains.kotlinx.dataframe.api.colsOf",
44314440
),
4441+
level = DeprecationLevel.ERROR,
44324442
)
44334443
public fun <C> KProperty<*>.dfsOf(type: KType, predicate: (ColumnWithPath<C>) -> Boolean = { true }): ColumnSet<*> =
44344444
toColumnAccessor().dfsOf(type, predicate)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,31 +167,31 @@ public fun <T> DataRow<T>.diffOrNull(expression: RowExpression<T, Float>): Float
167167
@Deprecated(
168168
DIFF_DEPRECATION_MESSAGE,
169169
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
170-
DeprecationLevel.WARNING
170+
DeprecationLevel.ERROR
171171
)
172172
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Double>): Double? =
173173
prev()?.let { p -> expression(this, this) - expression(p, p) }
174174

175175
@Deprecated(
176176
DIFF_DEPRECATION_MESSAGE,
177177
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
178-
DeprecationLevel.WARNING
178+
DeprecationLevel.ERROR
179179
)
180180
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Int>): Int? =
181181
prev()?.let { p -> expression(this, this) - expression(p, p) }
182182

183183
@Deprecated(
184184
DIFF_DEPRECATION_MESSAGE,
185185
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
186-
DeprecationLevel.WARNING
186+
DeprecationLevel.ERROR
187187
)
188188
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Long>): Long? =
189189
prev()?.let { p -> expression(this, this) - expression(p, p) }
190190

191191
@Deprecated(
192192
DIFF_DEPRECATION_MESSAGE,
193193
ReplaceWith(DIFF_REPLACE_MESSAGE, DIFF_OR_NULL_IMPORT),
194-
DeprecationLevel.WARNING
194+
DeprecationLevel.ERROR
195195
)
196196
public fun <T> DataRow<T>.diff(expression: RowExpression<T, Float>): Float? =
197197
prev()?.let { p -> expression(this, this) - expression(p, p) }

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

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
66
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
77
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
88
import org.jetbrains.kotlinx.dataframe.documentation.*
9-
import org.jetbrains.kotlinx.dataframe.util.ITERABLE_COLUMNS_DEPRECATION_MESSAGE
109
import kotlin.reflect.KProperty
1110

1211
// region fillNulls
@@ -189,17 +188,6 @@ public fun <T, C> DataFrame<T>.fillNulls(vararg columns: KProperty<C>): Update<T
189188
public fun <T, C> DataFrame<T>.fillNulls(vararg columns: ColumnReference<C>): Update<T, C?> =
190189
fillNulls { columns.toColumnSet() }
191190

192-
@Deprecated(
193-
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
194-
replaceWith = ReplaceWith(
195-
"fillNulls { columns.toColumnSet() }",
196-
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
197-
),
198-
level = DeprecationLevel.ERROR,
199-
)
200-
public fun <T, C> DataFrame<T>.fillNulls(columns: Iterable<ColumnReference<C>>): Update<T, C?> =
201-
fillNulls { columns.toColumnSet() }
202-
203191
// endregion
204192

205193
internal inline val Any?.isNaN: Boolean get() = (this is Double && isNaN()) || (this is Float && isNaN())
@@ -392,17 +380,6 @@ public fun <T, C> DataFrame<T>.fillNaNs(vararg columns: KProperty<C>): Update<T,
392380
public fun <T, C> DataFrame<T>.fillNaNs(vararg columns: ColumnReference<C>): Update<T, C> =
393381
fillNaNs { columns.toColumnSet() }
394382

395-
@Deprecated(
396-
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
397-
replaceWith = ReplaceWith(
398-
"fillNaNs { columns.toColumnSet() }",
399-
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
400-
),
401-
level = DeprecationLevel.ERROR,
402-
)
403-
public fun <T, C> DataFrame<T>.fillNaNs(columns: Iterable<ColumnReference<C>>): Update<T, C> =
404-
fillNaNs { columns.toColumnSet() }
405-
406383
// endregion
407384

408385
// region fillNA
@@ -575,17 +552,6 @@ public fun <T, C> DataFrame<T>.fillNA(vararg columns: KProperty<C>): Update<T, C
575552
public fun <T, C> DataFrame<T>.fillNA(vararg columns: ColumnReference<C>): Update<T, C?> =
576553
fillNA { columns.toColumnSet() }
577554

578-
@Deprecated(
579-
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
580-
replaceWith = ReplaceWith(
581-
"fillNA { columns.toColumnSet() }",
582-
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
583-
),
584-
level = DeprecationLevel.ERROR,
585-
)
586-
public fun <T, C> DataFrame<T>.fillNA(columns: Iterable<ColumnReference<C>>): Update<T, C?> =
587-
fillNA { columns.toColumnSet() }
588-
589555
// endregion
590556

591557
/** @param columns The [Columns selector DSL][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.Dsl.WithExample] used to select the columns of this [DataFrame] to drop rows in. */
@@ -785,20 +751,6 @@ public fun <T> DataFrame<T>.dropNulls(vararg columns: String, whereAllNull: Bool
785751
public fun <T> DataFrame<T>.dropNulls(vararg columns: AnyColumnReference, whereAllNull: Boolean = false): DataFrame<T> =
786752
dropNulls(whereAllNull) { columns.toColumnSet() }
787753

788-
@Deprecated(
789-
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
790-
replaceWith = ReplaceWith(
791-
"dropNulls(whereAllNull) { columns.toColumnSet() }",
792-
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
793-
),
794-
level = DeprecationLevel.ERROR,
795-
)
796-
public fun <T> DataFrame<T>.dropNulls(
797-
columns: Iterable<AnyColumnReference>,
798-
whereAllNull: Boolean = false,
799-
): DataFrame<T> =
800-
dropNulls(whereAllNull) { columns.toColumnSet() }
801-
802754
/**
803755
* ## The Drop Nulls Operation
804756
*
@@ -974,17 +926,6 @@ public fun <T> DataFrame<T>.dropNA(vararg columns: String, whereAllNA: Boolean =
974926
public fun <T> DataFrame<T>.dropNA(vararg columns: AnyColumnReference, whereAllNA: Boolean = false): DataFrame<T> =
975927
dropNA(whereAllNA) { columns.toColumnSet() }
976928

977-
@Deprecated(
978-
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
979-
replaceWith = ReplaceWith(
980-
"dropNA(whereAllNA) { columns.toColumnSet() }",
981-
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
982-
),
983-
level = DeprecationLevel.ERROR,
984-
)
985-
public fun <T> DataFrame<T>.dropNA(columns: Iterable<AnyColumnReference>, whereAllNA: Boolean = false): DataFrame<T> =
986-
dropNA(whereAllNA) { columns.toColumnSet() }
987-
988929
/**
989930
* ## The Drop `NA` Operation
990931
*
@@ -1182,20 +1123,6 @@ public fun <T> DataFrame<T>.dropNaNs(vararg columns: String, whereAllNaN: Boolea
11821123
public fun <T> DataFrame<T>.dropNaNs(vararg columns: AnyColumnReference, whereAllNaN: Boolean = false): DataFrame<T> =
11831124
dropNaNs(whereAllNaN) { columns.toColumnSet() }
11841125

1185-
@Deprecated(
1186-
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
1187-
replaceWith = ReplaceWith(
1188-
"dropNaNs(whereAllNaN) { columns.toColumnSet() }",
1189-
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
1190-
),
1191-
level = DeprecationLevel.ERROR,
1192-
)
1193-
public fun <T> DataFrame<T>.dropNaNs(
1194-
columns: Iterable<AnyColumnReference>,
1195-
whereAllNaN: Boolean = false,
1196-
): DataFrame<T> =
1197-
dropNaNs(whereAllNaN) { columns.toColumnSet() }
1198-
11991126
/**
12001127
* ## The Drop `NaN` Operation
12011128
*

0 commit comments

Comments
 (0)