Adapted for changes in svMisc, svBase and data.io

Author: phgrosjean

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: chart
 Type: Package
-Version: 1.5.3
+Version: 1.5.4
 Title: 'SciViews::R' - Unified Interface (with Formula) for R Plots
 Description: Chart generalizes plot generation in R, being with base R plot
   function, lattice or ggplot2. A formula interface is available for both
@@ -17,7 +17,6 @@ Depends:
     lattice (>= 0.21.0)
 Imports:
     cowplot (>= 1.1.1),
-    data.io (>= 1.5.0),
     ggplotify (>= 0.1.0),
     ggpubr (>= 0.6.0),
     graphics (>= 4.2.0),
@@ -27,10 +26,11 @@ Imports:
     rlang (>= 1.1.1),
     scales (>= 1.2.1),
     stats (>= 4.2.0),
-    svMisc (>= 1.4.0),
+    svBase (>= 1.7.0),
     utils (>= 4.2.0),
     viridis (>= 0.6.2)
 Suggests:
+    data.io (>= 1.7.0),
     MASS (>= 7.3.58.3),
     covr (>= 3.5.0),
     knitr (>= 1.42),
@@ -39,7 +39,7 @@ Suggests:
     testthat (>= 3.0.0)
 Remotes:
     SciViews/data.io,
-    SciViews/svMisc
+    SciViews/svBase
 License: MIT + file LICENSE
 URL: https://github.com/SciViews/chart, https://www.sciviews.org/chart/, https://sciviews.r-universe.dev/chart
 BugReports: https://github.com/SciViews/chart/issues

NAMESPACE

@@ -24,7 +24,6 @@ import(grDevices)
 import(graphics)
 import(lattice)
 importFrom(cowplot,theme_cowplot)
-importFrom(data.io,label)
 importFrom(ggplotify,as.ggplot)
 importFrom(ggpubr,ggarrange)
 importFrom(latticeExtra,custom.theme)
@@ -43,8 +42,9 @@ importFrom(scales,gradient_n_pal)
 importFrom(scales,hue_pal)
 importFrom(stats,as.formula)
 importFrom(stats,asOneSidedFormula)
-importFrom(svMisc,aka)
-importFrom(svMisc,section)
+importFrom(svBase,aka)
+importFrom(svBase,label)
+importFrom(svBase,section)
 importFrom(utils,.DollarNames)
 importFrom(utils,apropos)
 importFrom(utils,modifyList)

NEWS.md

@@ -1,6 +1,10 @@
+# chart 1.5.4
+
+-   Uses `aka()`, `section()` and `label()` from {svBase} (>= 1.7.0). No more dependencies to {data.io} and {svMisc}.
+
 # chart 1.5.3
 
--   Now using `$.subsettable_type()` method from {svMisc}.
+-   Now using `$.subsettable_type()` method from {svBase}.
 
 # chart 1.5.2
 

R/chart-package.R

@@ -28,10 +28,9 @@
 #' @importFrom stats as.formula asOneSidedFormula
 #' @importFrom utils .DollarNames apropos modifyList
 #' @importFrom pryr modify_lang
-#' @importFrom data.io label
 #' @importFrom ggplotify as.ggplot
 #' @importFrom ggpubr ggarrange
-#' @importFrom svMisc aka section
+#' @importFrom svBase aka section label
 ## usethis namespace: end
 "_PACKAGE"
 

R/chart.R

@@ -209,7 +209,7 @@ chart.default <- function(data, specif = NULL, formula = NULL, mapping = NULL,
     names(labels) <- dnames
     if (!is.null(dnames)) {
       for (dname in dnames)
-        labels[[dname]] <- data.io::label(data[[dname]], units = TRUE)
+        labels[[dname]] <- svBase::label(data[[dname]], units = TRUE)
       labels <- labels[labels != ""]
       if (length(labels)) {
         dnames <- names(labels)

README.Rmd

@@ -31,10 +31,10 @@ The {chart} package  provides an alternate formula interface to {ggplot2}, and i
 
 ## Installation
 
-{chart} is not available from CRAN yet. You should install it from the [SciViews R-Universe](https://sciviews.r-universe.dev). The {data.io} package is useful too because it manages labels and units that {chart} uses. To install those two packages and their dependencies, run the following command in R:
+{chart} is not available from CRAN yet. You should install it from the [SciViews R-Universe](https://sciviews.r-universe.dev). The {svBase} package is useful too because it manages labels and units that {chart} uses. To install those two packages and their dependencies, run the following command in R:
 
 ```{r, eval=FALSE}
-install.packages(c('chart', 'data.io'),
+install.packages(c('chart', 'svBase'),
   repos = c('https://sciviews.r-universe.dev', 'https://cloud.r-project.org'))
 ```
 
@@ -58,7 +58,7 @@ Starting from the `airquality` from {datasets}, we can annotate our dataset with
 
 ```{r}
 data(airquality, package = "datasets")
-airquality <- data.io::labelise(airquality, label = list(
+airquality <- svBase::labelise(airquality, label = list(
   Ozone = "Ozone", Temp = "Temperature", Solar.R = "Solar radiation",
   Wind = "Wind speed"
 ), units = list(

README.md

@@ -27,13 +27,13 @@ for more details.
 ## Installation
 
 {chart} is not available from CRAN yet. You should install it from the
-[SciViews R-Universe](https://sciviews.r-universe.dev). The {data.io}
+[SciViews R-Universe](https://sciviews.r-universe.dev). The {svBase}
 package is useful too because it manages labels and units that {chart}
 uses. To install those two packages and their dependencies, run the
 following command in R:
 
 ``` r
-install.packages(c('chart', 'data.io'),
+install.packages(c('chart', 'svBase'),
   repos = c('https://sciviews.r-universe.dev', 'https://cloud.r-project.org'))
 ```
 
@@ -61,7 +61,7 @@ dataset with labels and units for its variable like this:
 
 ``` r
 data(airquality, package = "datasets")
-airquality <- data.io::labelise(airquality, label = list(
+airquality <- svBase::labelise(airquality, label = list(
   Ozone = "Ozone", Temp = "Temperature", Solar.R = "Solar radiation",
   Wind = "Wind speed"
 ), units = list(

inst/WORDLIST

@@ -5,6 +5,7 @@ devtools
 exploreit
 ggplot
 GitHub
+io
 modelit
 ORCID
 OSX
@@ -13,6 +14,7 @@ README
 reusability
 SciViews
 subsettable
+svBase
 svMisc
 thetics
 viridis

vignettes/chart_rationate.R

@@ -31,7 +31,7 @@ chart(function() {
 })
 
 ## -----------------------------------------------------------------------------
-trees <- data.io::labelise(trees, label = list(
+trees <- svBase::labelise(trees, label = list(
     Volume = "Volume of timber",
     Girth  = "Diameter at 1.4m",
     Height = "Height"

vignettes/chart_rationate.Rmd

@@ -78,7 +78,7 @@ See packages like [{modelit}](https://www.sciviews.org/modelit/) or [{exploreit}
 Another aspect of `chart()` is that it is tailored to produce plots that are as close as possible to be publication-ready (but they. remain fully editable with {ggplot2} functions, of course). Hence, the default theme, and the labels of axes or legends are set up accordingly. If the data frame has **label** and **units** attributes defined for the variables, they are used to construct the labels of the axes and legends. Here is an example with the `trees` dataset:
 
 ```{r} 
-trees <- data.io::labelise(trees, label = list(
+trees <- svBase::labelise(trees, label = list(
     Volume = "Volume of timber",
     Girth  = "Diameter at 1.4m",
     Height = "Height"