From e48276f555173826b2360b45449414c14a77c1a6 Mon Sep 17 00:00:00 2001 From: Ian Lyttle Date: Sat, 14 Dec 2019 17:50:48 -0600 Subject: [PATCH] Altair4 (#123) * bump version * update to Vega 4.0.0 * update S3 methods to use altair v4 (vs v3) patch gallery so examples work using v4 * Point remote to vegawidget master-branch --- DESCRIPTION | 8 +++++--- NAMESPACE | 18 ++++++++--------- NEWS.md | 4 +++- R/concatenation.R | 8 ++++---- R/utils-jupyterlab.R | 6 +++--- ...LevelMixin.R => utils-vegawidget-altair.R} | 8 ++++---- R/zzz.R | 2 +- man/altair_concatenation.Rd | 12 +++++------ man/as_vegaspec.Rd | 10 ++++------ man/knit_print.vegaspec.Rd | 10 ++++------ ...repr_text.altair.vegalite.v4.api.Chart.Rd} | 6 +++--- ...vegalite4.altair.vegalite.v4.api.Chart.Rd} | 6 +++--- pkgdown/_pkgdown.yml | 2 +- vignettes/example-gallery-02-bar-charts.Rmd | 20 +++++++++---------- vignettes/example-gallery-09-case-studies.Rmd | 5 ++--- vignettes/example-gallery-10-other-charts.Rmd | 4 ++-- 16 files changed, 64 insertions(+), 65 deletions(-) rename R/{utils-vegawidget-altair.vegalite.v3.api.TopLevelMixin.R => utils-vegawidget-altair.R} (70%) rename man/{repr_text.altair.vegalite.v3.api.Chart.Rd => repr_text.altair.vegalite.v4.api.Chart.Rd} (65%) rename man/{repr_vegalite3.altair.vegalite.v3.api.Chart.Rd => repr_vegalite4.altair.vegalite.v4.api.Chart.Rd} (67%) diff --git a/DESCRIPTION b/DESCRIPTION index cb9b987c..faeb47ed 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: altair -Version: 3.1.1.9000 +Version: 4.0.0.9000 Title: Interface to 'Altair' Description: Interface to 'Altair' , which itself is a 'Python' interface to 'Vega-Lite' . @@ -26,7 +26,7 @@ Authors@R: c( person("Jake", "Vanderplas", comment = "Altair library", role = c("ctb")), person("Brian", "Granger", comment = "Altair library", role = c("ctb")) ) -SystemRequirements: Python (>= 3.5.0), (Python) Altair (>= 3.1.0) +SystemRequirements: Python (>= 3.5.0), (Python) Altair (>= 4.0.0) License: MIT + file LICENSE Encoding: UTF-8 LazyData: true @@ -41,7 +41,7 @@ Imports: magrittr, jsonlite, utils, - vegawidget (>= 0.2.1), + vegawidget (>= 0.2.2.9000), repr Suggests: httr, @@ -64,3 +64,5 @@ Suggests: fs Roxygen: list(markdown = TRUE) RoxygenNote: 6.1.1 +Remotes: + vegawidget/vegawidget diff --git a/NAMESPACE b/NAMESPACE index 5311fc26..965127bc 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,13 +1,13 @@ # Generated by roxygen2: do not edit by hand -S3method("&",altair.vegalite.v3.api.TopLevelMixin) -S3method("+",altair.vegalite.v3.api.TopLevelMixin) -S3method("|",altair.vegalite.v3.api.TopLevelMixin) -S3method(as_vegaspec,altair.vegalite.v3.api.TopLevelMixin) +S3method("&",altair.vegalite.v4.api.TopLevelMixin) +S3method("+",altair.vegalite.v4.api.TopLevelMixin) +S3method("|",altair.vegalite.v4.api.TopLevelMixin) +S3method(as_vegaspec,altair.vegalite.v4.api.TopLevelMixin) S3method(format,altair.vegalite.v2.api.TopLevelMixin) -S3method(format,altair.vegalite.v3.api.TopLevelMixin) -S3method(print,altair.vegalite.v3.api.TopLevelMixin) -S3method(repr_text,altair.vegalite.v3.api.Chart) +S3method(format,altair.vegalite.v4.api.TopLevelMixin) +S3method(print,altair.vegalite.v4.api.TopLevelMixin) +S3method(repr_text,altair.vegalite.v4.api.Chart) export("%>%") export(JS) export(alt) @@ -17,10 +17,10 @@ export(as_vegaspec) export(check_altair) export(import_vega_data) export(install_altair) -export(knit_print.altair.vegalite.v3.api.TopLevelMixin) +export(knit_print.altair.vegalite.v4.api.TopLevelMixin) export(knit_print.vegaspec) export(renderVegawidget) -export(repr_vegalite3.altair.vegalite.v3.api.Chart) +export(repr_vegalite4.altair.vegalite.v4.api.Chart) export(vega_embed) export(vegawidget) export(vegawidgetOutput) diff --git a/NEWS.md b/NEWS.md index 81973a5d..f269f439 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,6 @@ -# altair 3.1.1 (development version) +# altair 4.0.0.9000 (development version) + +* Upgrade to Altair 4.0.0 # altair 3.1.1 diff --git a/R/concatenation.R b/R/concatenation.R index 8b52c7fc..e0900e64 100644 --- a/R/concatenation.R +++ b/R/concatenation.R @@ -55,13 +55,13 @@ NULL is_altair_chart <- function(x) { - inherits(x, "altair.vegalite.v3.api.TopLevelMixin") + inherits(x, "altair.vegalite.v4.api.TopLevelMixin") } #' @rdname altair_concatenation #' @export #' -"|.altair.vegalite.v3.api.TopLevelMixin" <- function(e1, e2) { +"|.altair.vegalite.v4.api.TopLevelMixin" <- function(e1, e2) { if (!is_altair_chart(e2)) { stop("Second argument to | is not an Altair Chart") } @@ -71,7 +71,7 @@ is_altair_chart <- function(x) { #' @rdname altair_concatenation #' @export #' -"+.altair.vegalite.v3.api.TopLevelMixin" <- function(e1, e2) { +"+.altair.vegalite.v4.api.TopLevelMixin" <- function(e1, e2) { if (!is_altair_chart(e2)) { stop("Second argument to + is not an Altair Chart") } @@ -81,7 +81,7 @@ is_altair_chart <- function(x) { #' @rdname altair_concatenation #' @export #' -"&.altair.vegalite.v3.api.TopLevelMixin" <- function(e1, e2) { +"&.altair.vegalite.v4.api.TopLevelMixin" <- function(e1, e2) { if (!is_altair_chart(e2)) { stop("Second argument to & is not an Altair Chart") } diff --git a/R/utils-jupyterlab.R b/R/utils-jupyterlab.R index d46d4e07..5b10d2eb 100644 --- a/R/utils-jupyterlab.R +++ b/R/utils-jupyterlab.R @@ -18,7 +18,7 @@ py_mimebundle <- function(obj) { #' @importFrom repr repr_text #' @export #' -repr_text.altair.vegalite.v3.api.Chart <- function(obj) { +repr_text.altair.vegalite.v4.api.Chart <- function(obj) { py_mimebundle(obj)$`text/plain` } @@ -31,6 +31,6 @@ repr_text.altair.vegalite.v3.api.Chart <- function(obj) { #' @importFrom repr repr_vegalite2 #' @export #' -repr_vegalite3.altair.vegalite.v3.api.Chart <- function(obj) { - py_mimebundle(obj)$`application/vnd.vegalite.v3+json` +repr_vegalite4.altair.vegalite.v4.api.Chart <- function(obj) { + py_mimebundle(obj)$`application/vnd.vegalite.v4+json` } diff --git a/R/utils-vegawidget-altair.vegalite.v3.api.TopLevelMixin.R b/R/utils-vegawidget-altair.R similarity index 70% rename from R/utils-vegawidget-altair.vegalite.v3.api.TopLevelMixin.R rename to R/utils-vegawidget-altair.R index ae058826..768587e2 100644 --- a/R/utils-vegawidget-altair.vegalite.v3.api.TopLevelMixin.R +++ b/R/utils-vegawidget-altair.R @@ -2,7 +2,7 @@ #' @rdname as_vegaspec #' @export #' -as_vegaspec.altair.vegalite.v3.api.TopLevelMixin <- function(spec, ...) { +as_vegaspec.altair.vegalite.v4.api.TopLevelMixin <- function(spec, ...) { # TODO: if needed, insert code to convert your object to # something that can be coerced to a vegaspec. @@ -15,7 +15,7 @@ as_vegaspec.altair.vegalite.v3.api.TopLevelMixin <- function(spec, ...) { #' @export #' -print.altair.vegalite.v3.api.TopLevelMixin <- function(x, ...) { +print.altair.vegalite.v4.api.TopLevelMixin <- function(x, ...) { x <- as_vegaspec(x) @@ -24,7 +24,7 @@ print.altair.vegalite.v3.api.TopLevelMixin <- function(x, ...) { #' @export #' -format.altair.vegalite.v3.api.TopLevelMixin <- function(x, ...) { +format.altair.vegalite.v4.api.TopLevelMixin <- function(x, ...) { x <- as_vegaspec(x) @@ -35,7 +35,7 @@ format.altair.vegalite.v3.api.TopLevelMixin <- function(x, ...) { #' @rdname knit_print.vegaspec #' @export #' -knit_print.altair.vegalite.v3.api.TopLevelMixin <- function(spec, ..., options = NULL) { +knit_print.altair.vegalite.v4.api.TopLevelMixin <- function(spec, ..., options = NULL) { spec <- as_vegaspec(spec) diff --git a/R/zzz.R b/R/zzz.R index 1dac35ec..f8af7464 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -59,7 +59,7 @@ on_altair_error <- function(e) { .onLoad <- function(libname, pkgname) { # sets the supported version - options(altair.python.version = "3.1.0") + options(altair.python.version = "4.0.0") alt <<- reticulate::import( diff --git a/man/altair_concatenation.Rd b/man/altair_concatenation.Rd index c126b0ed..34bb2e6b 100644 --- a/man/altair_concatenation.Rd +++ b/man/altair_concatenation.Rd @@ -2,16 +2,16 @@ % Please edit documentation in R/concatenation.R \name{altair_concatenation} \alias{altair_concatenation} -\alias{|.altair.vegalite.v3.api.TopLevelMixin} -\alias{+.altair.vegalite.v3.api.TopLevelMixin} -\alias{&.altair.vegalite.v3.api.TopLevelMixin} +\alias{|.altair.vegalite.v4.api.TopLevelMixin} +\alias{+.altair.vegalite.v4.api.TopLevelMixin} +\alias{&.altair.vegalite.v4.api.TopLevelMixin} \title{Altair plot concatenation} \usage{ -\method{|}{altair.vegalite.v3.api.TopLevelMixin}(e1, e2) +\method{|}{altair.vegalite.v4.api.TopLevelMixin}(e1, e2) -\method{+}{altair.vegalite.v3.api.TopLevelMixin}(e1, e2) +\method{+}{altair.vegalite.v4.api.TopLevelMixin}(e1, e2) -\method{&}{altair.vegalite.v3.api.TopLevelMixin}(e1, e2) +\method{&}{altair.vegalite.v4.api.TopLevelMixin}(e1, e2) } \arguments{ \item{e1}{Altair chart object} diff --git a/man/as_vegaspec.Rd b/man/as_vegaspec.Rd index fe3f408c..726c0d9c 100644 --- a/man/as_vegaspec.Rd +++ b/man/as_vegaspec.Rd @@ -1,13 +1,11 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in -% R/utils-vegawidget-altair.vegalite.v3.api.TopLevelMixin.R, -% R/utils-vegawidget.R -\name{as_vegaspec.altair.vegalite.v3.api.TopLevelMixin} -\alias{as_vegaspec.altair.vegalite.v3.api.TopLevelMixin} +% Please edit documentation in R/utils-vegawidget-altair.R, R/utils-vegawidget.R +\name{as_vegaspec.altair.vegalite.v4.api.TopLevelMixin} +\alias{as_vegaspec.altair.vegalite.v4.api.TopLevelMixin} \alias{as_vegaspec} \title{Coerce to vegaspec} \usage{ -\method{as_vegaspec}{altair.vegalite.v3.api.TopLevelMixin}(spec, ...) +\method{as_vegaspec}{altair.vegalite.v4.api.TopLevelMixin}(spec, ...) } \arguments{ \item{spec}{An object to be coerced to \code{vegaspec}, a Vega/Vega-Lite specification} diff --git a/man/knit_print.vegaspec.Rd b/man/knit_print.vegaspec.Rd index 0ec7fa76..40fdc39b 100644 --- a/man/knit_print.vegaspec.Rd +++ b/man/knit_print.vegaspec.Rd @@ -1,13 +1,11 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in -% R/utils-vegawidget-altair.vegalite.v3.api.TopLevelMixin.R, -% R/utils-vegawidget.R -\name{knit_print.altair.vegalite.v3.api.TopLevelMixin} -\alias{knit_print.altair.vegalite.v3.api.TopLevelMixin} +% Please edit documentation in R/utils-vegawidget-altair.R, R/utils-vegawidget.R +\name{knit_print.altair.vegalite.v4.api.TopLevelMixin} +\alias{knit_print.altair.vegalite.v4.api.TopLevelMixin} \alias{knit_print.vegaspec} \title{Knit-print method} \usage{ -knit_print.altair.vegalite.v3.api.TopLevelMixin(spec, ..., +knit_print.altair.vegalite.v4.api.TopLevelMixin(spec, ..., options = NULL) } \arguments{ diff --git a/man/repr_text.altair.vegalite.v3.api.Chart.Rd b/man/repr_text.altair.vegalite.v4.api.Chart.Rd similarity index 65% rename from man/repr_text.altair.vegalite.v3.api.Chart.Rd rename to man/repr_text.altair.vegalite.v4.api.Chart.Rd index 9cb9c9e4..53b166ff 100644 --- a/man/repr_text.altair.vegalite.v3.api.Chart.Rd +++ b/man/repr_text.altair.vegalite.v4.api.Chart.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils-jupyterlab.R -\name{repr_text.altair.vegalite.v3.api.Chart} -\alias{repr_text.altair.vegalite.v3.api.Chart} +\name{repr_text.altair.vegalite.v4.api.Chart} +\alias{repr_text.altair.vegalite.v4.api.Chart} \title{MIME method for text} \usage{ -\method{repr_text}{altair.vegalite.v3.api.Chart}(obj) +\method{repr_text}{altair.vegalite.v4.api.Chart}(obj) } \arguments{ \item{obj}{Altair chart object to be rendered} diff --git a/man/repr_vegalite3.altair.vegalite.v3.api.Chart.Rd b/man/repr_vegalite4.altair.vegalite.v4.api.Chart.Rd similarity index 67% rename from man/repr_vegalite3.altair.vegalite.v3.api.Chart.Rd rename to man/repr_vegalite4.altair.vegalite.v4.api.Chart.Rd index 9385a468..0a385c1b 100644 --- a/man/repr_vegalite3.altair.vegalite.v3.api.Chart.Rd +++ b/man/repr_vegalite4.altair.vegalite.v4.api.Chart.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils-jupyterlab.R -\name{repr_vegalite3.altair.vegalite.v3.api.Chart} -\alias{repr_vegalite3.altair.vegalite.v3.api.Chart} +\name{repr_vegalite4.altair.vegalite.v4.api.Chart} +\alias{repr_vegalite4.altair.vegalite.v4.api.Chart} \title{MIME method for chart rendering} \usage{ -repr_vegalite3.altair.vegalite.v3.api.Chart(obj) +repr_vegalite4.altair.vegalite.v4.api.Chart(obj) } \arguments{ \item{obj}{Altair chart object to be rendered} diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml index cbcab169..4e4cf196 100644 --- a/pkgdown/_pkgdown.yml +++ b/pkgdown/_pkgdown.yml @@ -31,7 +31,7 @@ reference: contents: - vegawidget - vega_embed - - knit_print.altair.vegalite.v3.api.TopLevelMixin + - knit_print.altair.vegalite.v4.api.TopLevelMixin - image - title: Package desc: Overview of the package diff --git a/vignettes/example-gallery-02-bar-charts.Rmd b/vignettes/example-gallery-02-bar-charts.Rmd index 5232dbcf..48a5b4ec 100644 --- a/vignettes/example-gallery-02-bar-charts.Rmd +++ b/vignettes/example-gallery-02-bar-charts.Rmd @@ -228,28 +228,28 @@ glimpse(data) #### Chart ```{r} -a <- +bar <- alt$Chart(data = data)$ mark_bar()$ encode( x = "project:O", y = "score:Q" - ) + )$ + properties(width = alt$Step(40)) -b <- +tick <- alt$Chart(data = data)$ - mark_tick(color = "red")$ + mark_tick( + color = "red", + thickness = 2, + size = 40 * 0.9 + )$ encode( x = "project:O", y = "goal:Q" ) -chart <- - (a + b)$ - # controls the width of the tick - configure_tick(thickness = 2, bandSize = 35)$ - # controls the width of the bar - configure_scale(rangeStep = 40) +chart <- (bar + tick) chart ``` diff --git a/vignettes/example-gallery-09-case-studies.Rmd b/vignettes/example-gallery-09-case-studies.Rmd index c7510cbb..1fe44433 100644 --- a/vignettes/example-gallery-09-case-studies.Rmd +++ b/vignettes/example-gallery-09-case-studies.Rmd @@ -164,7 +164,6 @@ chart <- op = "sum", order = "descending" ), - scale = alt$Scale(rangeStep = 20), axis = alt$Axis(grid = TRUE) ), color = alt$Color("year:N", legend = alt$Legend(title = "Year")), @@ -178,6 +177,7 @@ chart <- ) ) )$ + properties(height = alt$Step(20))$ configure_view(stroke = "transparent") chart @@ -1275,11 +1275,10 @@ chart <- title = "Population", axis = alt$Axis(format = "~s") ), - facet = "year:O" + facet = alt$Facet("year:O", columns = 5) )$ properties( title = "US Age Distribution By Year", - columns = 5, width = 90, height = 80 ) diff --git a/vignettes/example-gallery-10-other-charts.Rmd b/vignettes/example-gallery-10-other-charts.Rmd index 6d2226c8..d082187a 100644 --- a/vignettes/example-gallery-10-other-charts.Rmd +++ b/vignettes/example-gallery-10-other-charts.Rmd @@ -94,9 +94,9 @@ chart <- x = alt$X("median(yield)", scale=alt$Scale(zero = FALSE)), y = "variety:O", color = "year:N", - facet = "site:O" + facet = alt$Facet("site:O", columns = 2) )$ - properties(columns = 2, width = 200, height = 100) + properties(width = 200, height = 100) chart ```