Skip to content

Commit

Permalink
Merge pull request #96 from sjmgarnier/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sjmgarnier authored Jan 28, 2024
2 parents 28eabfe + e0ce00a commit d12f212
Show file tree
Hide file tree
Showing 116 changed files with 971 additions and 658 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ README.md
cran-comments.md
^CRAN-RELEASE$
^CRAN-SUBMISSION$
.vscode
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ vignettes/*.pdf
.RData
cran_graphs.R
cran_graphs2.R
.vscode
revdep/checks.noindex
revdep/library.noindex
revdep/data.sqlite
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: viridis
Type: Package
Title: Colorblind-Friendly Color Maps for R
Version: 0.6.4
Date: 2023-07-19
Version: 0.6.5
Date: 2024-01-28
Authors@R: c(
person("Simon", "Garnier", email = "[email protected]", role = c("aut", "cre")),
person("Noam", "Ross", email = "[email protected]", role = c("ctb", "cph")),
Expand Down Expand Up @@ -48,4 +48,4 @@ LazyData: true
VignetteBuilder: knitr
URL: https://sjmgarnier.github.io/viridis/, https://github.com/sjmgarnier/viridis/
BugReports: https://github.com/sjmgarnier/viridis/issues
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
12 changes: 12 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# viridis 0.6.5

## New features

* N/A.

## Minor improvements and fixes

* Fix a problem with ggplot next release (thanks to @teunbrand).

---

# viridis 0.6.4

## New features
Expand Down
10 changes: 5 additions & 5 deletions R/scales.R
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#' \item "turbo" (or "H")
#' }
#'
#' @author Bob Rudis: \email{bob@@rud.is} / \href{https://twitter.com/hrbrmstr}{@@hrbrmstr}
#' @author Simon Garnier: \email{garnier@@njit.edu} / \href{https://twitter.com/sjmgarnier}{@@sjmgarnier}
#' @author Bob Rudis: \email{bob@@rud.is}
#' @author Simon Garnier: \email{garnier@@njit.edu}
#'
#' @examples
#' library(scales)
Expand Down Expand Up @@ -102,9 +102,9 @@ viridis_pal <- function(alpha = 1, begin = 0, end = 1, direction = 1, option= "D
#'
#' @rdname scale_viridis
#'
#' @author Noam Ross \email{noam.ross@@gmail.com} / \href{https://twitter.com/noamross}{@@noamross}
#' @author Bob Rudis \email{bob@@rud.is} / \href{https://twitter.com/hrbrmstr}{@@hrbrmstr}
#' @author Simon Garnier: \email{garnier@@njit.edu} / \href{https://twitter.com/sjmgarnier}{@@sjmgarnier}
#' @author Noam Ross \email{noam.ross@@gmail.com}
#' @author Bob Rudis \email{bob@@rud.is}
#' @author Simon Garnier: \email{garnier@@njit.edu}
#'
#' @importFrom ggplot2 scale_fill_gradientn scale_color_gradientn discrete_scale
#'
Expand Down
16 changes: 7 additions & 9 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Test environments

* local OS X 13.4.1, R 4.3.1, ARM
* local OS X 13.4.1, R-devel, ARM
* local OS X 14.2.1, R 4.3.2, ARM
* local OS X 14.2.1, R-devel, ARM
* Github Actions "windows-latest (release)"
* Github Actions "macOS-latest (release)"
* Github Actions "ubuntu-22.04-latest (release)"
Expand All @@ -20,20 +20,18 @@ verification. All URLs have been manually checked and are functional.

## Downstream dependencies

Downstream dependencies on CRAN and Bioconductor were checked with
'revdepcheck::revdep_check()'. We checked 200 reverse dependencies (198 from
CRAN + 2 from Bioconductor), comparing R CMD check results across CRAN and dev
versions of this package.
### revdepcheck results

We checked 213 reverse dependencies (211 from CRAN + 2 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.

* We saw 0 new problems
* We failed to check 2 packages
* We failed to check 1 packages

Issues with CRAN packages are summarised below.

### Failed to check

* nullabor (NA)
* simmr (NA)
* simmr (NA)

## CRAN team comments

Expand Down
6 changes: 3 additions & 3 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/LICENSE-text.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d12f212

Please sign in to comment.