Merge pull request #75 from sjmgarnier/develop

Fix test and check issues.
sjmgarnier · Apr 14, 2021 · b6ed31f · b6ed31f
2 parents 9fcc567 + f3dcf97
commit b6ed31f
Show file tree

Hide file tree

Showing 32 changed files with 77 additions and 70 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - master
+      - develop
   pull_request:
     branches:
       - main

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -20,7 +20,6 @@ Description: Color maps designed to improve graph readability for readers with
     'ggplot2' bindings can be found at 
     <https://cran.r-project.org/package=viridisLite>.
 License: MIT + file LICENSE
-LazyData: TRUE
 Encoding: UTF-8
 Depends:
     R (>= 2.10),
@@ -46,6 +45,6 @@ Suggests:
     rmarkdown,
     rgdal
 VignetteBuilder: knitr
-URL: http://sjmgarnier.github.io/viridis, https://github.com/sjmgarnier/viridis
+URL: https://sjmgarnier.github.io/viridis/, https://github.com/sjmgarnier/viridis/
 BugReports: https://github.com/sjmgarnier/viridis/issues
 RoxygenNote: 7.1.1
diff --git a/NAMESPACE b/NAMESPACE
@@ -11,6 +11,7 @@ export(scale_colour_viridis)
 export(scale_fill_viridis)
 export(turbo)
 export(viridis)
+export(viridis.map)
 export(viridis_pal)
 importFrom(ggplot2,discrete_scale)
 importFrom(ggplot2,scale_color_gradientn)
@@ -24,3 +25,4 @@ importFrom(viridisLite,plasma)
 importFrom(viridisLite,rocket)
 importFrom(viridisLite,turbo)
 importFrom(viridisLite,viridis)
+importFrom(viridisLite,viridis.map)
diff --git a/R/scales.R b/R/scales.R
@@ -212,3 +212,7 @@ viridisLite::rocket
 #' @importFrom viridisLite turbo
 #' @export
 viridisLite::turbo
+
+#' @importFrom viridisLite viridis.map
+#' @export
+viridisLite::viridis.map
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ The color maps `viridis`, `magma`, `inferno`, and `plasma` were created by
 Stéfan van der Walt ([@stefanv](https://github.com/stefanv)) and Nathaniel Smith ([@njsmith](https://github.com/njsmith)). If you want to know more about the 
 science behind the creation of these color maps, you can watch this 
 [presentation of `viridis`](https://youtu.be/xAoljeRJ3lU) by their authors at 
-[SciPy 2015](http://scipy2015.scipy.org/). 
+[SciPy 2015](https://scipy2015.scipy.org/). 
 
 The color map `cividis` is a corrected version of 'viridis', developed by 
 Jamie R. Nuñez, Christopher R. Anderton, and Ryan S. Renslow, and originally 

diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -1,4 +1,4 @@
-url: http://sjmgarnier.github.io/viridis
+url: https://sjmgarnier.github.io/viridis
 
 template:
   params:

diff --git a/cran-comments.md b/cran-comments.md
@@ -18,9 +18,8 @@ There were no ERRORs or WARNINGs.
 
 ## Downstream dependencies
 
-Downstream dependencies on CRAN and Bioconductor were checked with 
-'revdepcheck::revdep_check()'. All errors, warnings, and notes were found to be
-unrelated to this package. 
+Downstream dependencies on CRAN were checked with 'revdepcheck::revdep_check()'. 
+No new error, warning, and note were found to be caused by this package. 
 
 ## CRAN team comments
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/intro-to-viridis.html b/docs/articles/intro-to-viridis.html
diff --git a/docs/articles/intro-to-viridis_files/figure-html/tldr_ggplot-1.png b/docs/articles/intro-to-viridis_files/figure-html/tldr_ggplot-1.png
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,8 +3,8 @@ pkgdown: 1.6.1
 pkgdown_sha: ~
 articles:
   intro-to-viridis: intro-to-viridis.html
-last_built: 2021-04-14T06:18Z
+last_built: 2021-04-14T15:18Z
 urls:
-  reference: http://sjmgarnier.github.io/viridis/reference
-  article: http://sjmgarnier.github.io/viridis/articles
+  reference: https://sjmgarnier.github.io/viridis/reference
+  article: https://sjmgarnier.github.io/viridis/articles
 
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/reexports.html b/docs/reference/reexports.html
diff --git a/docs/reference/scale_viridis.html b/docs/reference/scale_viridis.html
diff --git a/docs/reference/viridis_pal.html b/docs/reference/viridis_pal.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ on: @@
         branches:
           - main
           - master
+          - develop
       pull_request:
         branches:
           - main
@@ Expand Down @@