From 49418b2ca6ee6ae165c034e56e4da77e4707f7ad Mon Sep 17 00:00:00 2001 From: brandl Date: Thu, 25 Aug 2022 21:37:48 +0200 Subject: [PATCH] v0.18.2 release --- README.md | 4 +-- build.gradle | 26 ++++++++++--------- docs/userguide/docs/index.md | 4 +-- src/main/kotlin/krangl/LetsPlot.kt | 4 +-- .../kotlin/krangl/integration/Integration.kt | 5 ++-- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index d3ee9774..3b80009e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # krangl -[ ![Download](https://img.shields.io/badge/Maven%20Central-0.18.1-orange) ](https://mvnrepository.com/artifact/com.github.holgerbrandl/krangl) [![Build Status](https://github.com/holgerbrandl/krangl/workflows/build/badge.svg)](https://github.com/holgerbrandl/krangl/actions?query=workflow%3Abuild) [![Gitter](https://badges.gitter.im/holgerbrandl/krangl.svg)](https://gitter.im/holgerbrandl/krangl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[ ![Download](https://img.shields.io/badge/Maven%20Central-0.18.2-orange) ](https://mvnrepository.com/artifact/com.github.holgerbrandl/krangl) [![Build Status](https://github.com/holgerbrandl/krangl/workflows/build/badge.svg)](https://github.com/holgerbrandl/krangl/actions?query=workflow%3Abuild) [![Gitter](https://badges.gitter.im/holgerbrandl/krangl.svg)](https://gitter.im/holgerbrandl/krangl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) `krangl` is a {K}otlin library for data w{rangl}ing. By implementing a grammar of data manipulation using a modern functional-style API, it allows to filter, transform, aggregate and reshape tabular data. @@ -32,7 +32,7 @@ repositories { } dependencies { - implementation "com.github.holgerbrandl:krangl:0.18.1" + implementation "com.github.holgerbrandl:krangl:0.18.2" } ``` Declaring the repository is purely optional as it is the default already. diff --git a/build.gradle b/build.gradle index a46daa24..d49db555 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ plugins { - id "org.jetbrains.kotlin.jvm" version "1.7.0" + id "org.jetbrains.kotlin.jvm" version "1.7.10" id "java" id "maven-publish" id "signing" id "io.github.gradle-nexus.publish-plugin" version "1.1.0" - id "org.jetbrains.kotlin.jupyter.api" version "0.10.0-131-1" + id "org.jetbrains.kotlin.jupyter.api" version "0.11.0-87" } repositories { @@ -15,30 +15,30 @@ repositories { dependencies { - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.20' - implementation 'org.jetbrains.kotlin:kotlin-reflect:1.6.20' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10' + implementation 'org.jetbrains.kotlin:kotlin-reflect:1.7.10' // compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" // needed to work around https://youtrack.jetbrains.com/issue/KT-15064 - compileOnly 'org.jetbrains.kotlin:kotlin-script-runtime:1.6.20' + compileOnly 'org.jetbrains.kotlin:kotlin-script-runtime:1.7.10' - api "org.apache.commons:commons-csv:1.6" // cant upgrade to 1.8 because of https://issues.apache.org/jira/browse/CSV-257 + api 'org.apache.commons:commons-csv:1.6' // cant upgrade to 1.8 because of https://issues.apache.org/jira/browse/CSV-257 api 'org.apache.arrow:arrow-vector:8.0.0' implementation 'org.apache.arrow:arrow-memory-netty:8.0.0' api 'org.apache.poi:poi-ooxml:5.2.2' api 'com.beust:klaxon:5.6'// compile 'me.tongfei:progressbar:0.5.5' - api('org.jetbrains.lets-plot:lets-plot-kotlin-jvm:3.2.0') + api 'org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.0.0' // implementation("org.jetbrains.lets-plot:lets-plot-batik:2.0.4") // implementation 'org.jetbrains.kotlinx:dataframe:0.8.0-rc-7' // testImplementation 'org.jetbrains.kotlinx:dataframe:0.8.0-rc-7' testImplementation group: 'junit', name: 'junit', version: '4.13.1' - testImplementation('io.kotest:kotest-assertions-core:5.2.2') - testImplementation 'com.h2database:h2:2.1.212' - testImplementation 'org.jetbrains.kotlin:kotlin-script-runtime:1.6.10' + testImplementation 'io.kotest:kotest-assertions-core:5.4.2' + testImplementation 'com.h2database:h2:2.1.214' + testImplementation 'org.jetbrains.kotlin:kotlin-script-runtime:1.7.10' } @@ -100,9 +100,11 @@ test { //http://stackoverflow.com/questions/34377367/why-is-gradle-install-replacing-my-version-with-unspecified group 'com.github.holgerbrandl' //version '0.16.95' -version '0.18.1' - +version '0.18.2' +processJupyterApiResources { + libraryProducers = ["krangl.integration.Integration"] +} java { withJavadocJar() diff --git a/docs/userguide/docs/index.md b/docs/userguide/docs/index.md index 8e919fe4..4f95b948 100644 --- a/docs/userguide/docs/index.md +++ b/docs/userguide/docs/index.md @@ -1,4 +1,4 @@ -[ ![Download](https://img.shields.io/badge/Maven%20Central-0.18.1-orange) ](https://mvnrepository.com/artifact/com.github.holgerbrandl.krangl/krangl) [![Build Status](https://github.com/holgerbrandl/krangl/workflows/build/badge.svg)](https://github.com/holgerbrandl/krangl/actions?query=workflow%3Abuild) [![Gitter](https://badges.gitter.im/holgerbrandl/krangl.svg)](https://gitter.im/holgerbrandl/krangl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[ ![Download](https://img.shields.io/badge/Maven%20Central-0.18.2-orange) ](https://mvnrepository.com/artifact/com.github.holgerbrandl.krangl/krangl) [![Build Status](https://github.com/holgerbrandl/krangl/workflows/build/badge.svg)](https://github.com/holgerbrandl/krangl/actions?query=workflow%3Abuild) [![Gitter](https://badges.gitter.im/holgerbrandl/krangl.svg)](https://gitter.im/holgerbrandl/krangl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) This is the manual of [krangl](https://github.com/holgerbrandl/krangl). @@ -40,7 +40,7 @@ repositories { } dependencies { - implementation "com.github.holgerbrandl:krangl:0.18.1" + implementation "com.github.holgerbrandl:krangl:0.18.2" } ``` Declaring the repository is purely optional as it is the default already. diff --git a/src/main/kotlin/krangl/LetsPlot.kt b/src/main/kotlin/krangl/LetsPlot.kt index 3c813753..fbae93d0 100644 --- a/src/main/kotlin/krangl/LetsPlot.kt +++ b/src/main/kotlin/krangl/LetsPlot.kt @@ -1,9 +1,9 @@ package krangl -import jetbrains.letsPlot.intern.GenericAesMapping +import org.jetbrains.letsPlot.intern.GenericAesMapping /** Plot a data-frame with let-plot. To use this mapping add `implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:3.0.1")` or via `%use lets-plot` when using jupyter. */ -fun DataFrame.letsPlot(mapping: GenericAesMapping.() -> Unit = {}) = jetbrains.letsPlot.letsPlot(toMap(), mapping) +fun DataFrame.letsPlot(mapping: GenericAesMapping.() -> Unit = {}) = org.jetbrains.letsPlot.letsPlot(toMap(), mapping) //fun main() { diff --git a/src/main/kotlin/krangl/integration/Integration.kt b/src/main/kotlin/krangl/integration/Integration.kt index bb519f10..38d144dc 100644 --- a/src/main/kotlin/krangl/integration/Integration.kt +++ b/src/main/kotlin/krangl/integration/Integration.kt @@ -7,7 +7,6 @@ import krangl.KranglConfig.JUPYTER_DISPLAY_MAX_ROWS import krangl.KranglConfig.JUPYTER_DISPLAY_WIDTH import krangl.SimpleDataFrame import org.jetbrains.kotlinx.jupyter.api.HTML -import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration // main docs @@ -16,8 +15,10 @@ import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration //https://github.com/Kotlin/kotlin-jupyter/blob/master/libraries/krangl.json -@JupyterLibrary +//@JupyterLibrary +@Suppress("unused") internal class Integration : JupyterIntegration() { + override fun Builder.onLoaded() { import("krangl.*") render { HTML(it.toHTML()) }