Skip to content

Commit 6c78f42

Browse files
Merge branch 'master' into run_configs
# Conflicts: # .gitignore
2 parents 6b55c14 + be95786 commit 6c78f42

File tree

9 files changed

+9657
-1410
lines changed

9 files changed

+9657
-1410
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
.idea
33
!.idea/runConfigurations
44
!.idea/runConfigurations/*.xml
5+
!.idea/externalDependencies.xml
6+
!.idea/vcs.xml
57
.gradle
68
.kotlin
79
build

.idea/externalDependencies.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ allprojects {
189189
afterEvaluate {
190190
try {
191191
configure<KtlintExtension> {
192-
version = "1.4.1"
192+
version = "1.6.0"
193193
// rules are set up through .editorconfig
194194
}
195195
} catch (_: UnknownDomainObjectException) {

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/puzzles/DateTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.puzzles
33
import io.kotest.matchers.shouldBe
44
import kotlinx.datetime.LocalDate
55
import kotlinx.datetime.Month
6+
import kotlinx.datetime.isoDayNumber
67
import kotlinx.datetime.toJavaLocalDate
78
import org.jetbrains.kotlinx.dataframe.api.add
89
import org.jetbrains.kotlinx.dataframe.api.aggregate
@@ -113,7 +114,7 @@ class DateTests {
113114

114115
(start..end).toList().toColumn("3thu").filter {
115116
it.toJavaLocalDate()[WeekFields.of(Locale.ENGLISH).weekOfMonth()] == 3 &&
116-
it.dayOfWeek.value == 4
117+
it.dayOfWeek.isoDayNumber == 4
117118
} shouldBe expected
118119
}
119120
}

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/puzzles/DateTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.puzzles
33
import io.kotest.matchers.shouldBe
44
import kotlinx.datetime.LocalDate
55
import kotlinx.datetime.Month
6+
import kotlinx.datetime.isoDayNumber
67
import kotlinx.datetime.toJavaLocalDate
78
import org.jetbrains.kotlinx.dataframe.api.add
89
import org.jetbrains.kotlinx.dataframe.api.aggregate
@@ -113,7 +114,7 @@ class DateTests {
113114

114115
(start..end).toList().toColumn("3thu").filter {
115116
it.toJavaLocalDate()[WeekFields.of(Locale.ENGLISH).weekOfMonth()] == 3 &&
116-
it.dayOfWeek.value == 4
117+
it.dayOfWeek.isoDayNumber == 4
117118
} shouldBe expected
118119
}
119120
}

examples/notebooks/dev/top_12_german_companies/top_12_german_companies.ipynb

Lines changed: 8172 additions & 130 deletions
Large diffs are not rendered by default.

examples/notebooks/top_12_german_companies/top_12_german_companies.ipynb

Lines changed: 1446 additions & 1276 deletions
Large diffs are not rendered by default.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ksp = "2.0.20-1.0.24"
33
kotlinJupyter = "0.12.0-383"
44

5-
ktlint = "12.1.2"
5+
ktlint = "12.3.0"
66

77
# make sure to sync both manually with :generator module
88
kotlin = "2.0.20" # needs jupyter compatibility with Kotlin 2.1 to update

0 commit comments

Comments
 (0)