Skip to content

Commit

Permalink
minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
clauswilke committed Sep 15, 2017
1 parent b5a74bd commit b493298
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: ggridges
Type: Package
Title: Ridgeline Plots in 'ggplot2'
Version: 0.4.0.9990
Version: 0.4.1
Authors@R: c(
person("Claus O.", "Wilke", , "wilke@austin.utexas.edu", c("cre", "aut")),
person("RStudio", role = c("cph"), comment = "Copyright for ggplot2 code copied to ggridges"))
Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
ggridges 0.4.1
----------------------------------------------------------------
- Skip vdiffr visual tests when compiling on CRAN

ggridges 0.4.0
----------------------------------------------------------------
- Initial import of code base from ggjoy, and renaming:
Expand Down
6 changes: 4 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
This packages is meant as a replacement for the package 'ggjoy' currently on CRAN. I have changed the name because the term "joyplot" has an unfortunate history. It comes from the band Joy Division, which was named after Nazi concentration camp brothels (see here: https://en.wikipedia.org/wiki/House_of_Dolls ). In the 'ggridges' package, all references to "joyplots" have been changed into "ridgeline plots", and functions such as 'geom_joy' have been renamed into appropriate terms (e.g., 'geom_density_ridges').
Apologies for submitting a bug-fix release 1 day after submitting the original package. The package currently on CRAN doesn't build on some architectures, due to visual tests that are likely to fail due to minor changes in the build platform: https://cran.r-project.org/web/checks/check_results_ggridges.html

Once 'ggridges' is on CRAN, I will replace the 'ggjoy' package with a placeholder package that simply exports the 'ggridges' functions under the old 'ggjoy' name and warns users that 'ggjoy' is deprecated.
These tests should be automatically skipped but apparently that isn't happening. So I'm now manually disabling them on CRAN.

I have also fixed the problem with double spaces in the Description.

One data file contains UTF-8 marked strings. The file contains election results from Catalania,
and the municipality names contain non-ASCII characters. None of these names make it into the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ context("geom_density_ridges")
# Visual tests ------------------------------------------------------------

test_that("geom_density_ridges draws correctly", {
testthat::skip_on_cran()

p <- ggplot(iris, aes(x = Sepal.Length, y = Species)) + geom_density_ridges()
vdiffr::expect_doppelganger("geom_density_ridges basic", p)

Expand Down
2 changes: 2 additions & 0 deletions tests/testthat/test_geom_gradient.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ context("geom_*_gradient")

# Visual tests ------------------------------------------------------------
test_that("visual appearance", {
testthat::skip_on_cran()

df <- data.frame(x = c(1, 2, 3, 4, 5, 6),
height = c(1, 2, 3, 2, 1, 2),
type = c("A", "A", "B", "B", "C", "C"))
Expand Down
2 changes: 2 additions & 0 deletions tests/testthat/test_geom_vridgeline.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ context("geom_vridgeline")

# Visual tests ------------------------------------------------------------
test_that("visual appearance", {
testthat::skip_on_cran()

d <- data.frame(y = rep(1:5, 3), x = c(rep(0, 5), rep(1, 5), rep(3, 5)),
width = c(0, 1, 3, 4, 0, 1, 2, 3, 5, 4, 0, 5, 4, 4, 1))
p <- ggplot(d, aes(x, y, width = width, group = x)) + geom_vridgeline(fill="lightblue")
Expand Down
2 changes: 2 additions & 0 deletions tests/testthat/test_scale_cyclical.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ test_that("basic tests", {

# Visual tests ------------------------------------------------------------
test_that("visual appearance", {
testthat::skip_on_cran()

df <- data.frame(x=1:30, y=1:30)
p <- ggplot(df, aes(x, y, fill = factor(x))) + geom_point(shape = 21, size = 3) +
scale_fill_cyclical(values = c("#F00000", "#00F000", "#0000F0"))
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ test_that("key theme_ridges settings", {
# Visual tests ------------------------------------------------------------

test_that("theme_ridges draws correctly", {
testthat::skip_on_cran()

d <- data.frame(x = rep(1:5, 3), y = c(rep(0, 5), rep(1, 5), rep(3, 5)),
height = c(0, 1, 3, 4, 0, 1, 2, 3, 5, 4, 0, 5, 4, 4, 1))
p <- ggplot(d, aes(x, y, height = height, group = y)) + geom_ridgeline(fill="lightblue")
Expand Down

0 comments on commit b493298

Please sign in to comment.