Fix ggplot2 tests

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: sedproxy
 Title: Simulation of Sediment Archived Climate Proxy Records
-Version: 0.7.5.1
+Version: 0.7.5.2
 Authors@R: c(person("Thomas", "Laepple", email = "tlaepple@awi.de", role = c("aut")), 
     person("Andrew", "Dolman", email = "andrew.dolman@awi.de", role = c("aut", "cre")))
 Description: Proxy forward modelling for sediment archived climate proxies such 
@@ -13,7 +13,7 @@ License: MIT + file LICENSE
 Encoding: UTF-8
 Language: en-gb
 LazyData: true
-RoxygenNote: 7.2.0
+RoxygenNote: 7.3.2
 Depends:
     R (>= 3.5.0)
 Imports: stats, mvtnorm, dplyr, tidyr, ggplot2, rlang

NEWS.md

@@ -1,3 +1,8 @@
+# sedproxy 0.7.5.2
+* fixed test for ggplot2 objects to address https://github.com/tidyverse/ggplot2/issues/6498
+* fixed additional warnings for using .data in tidyselect
+* fixed warning for using @docType "package"
+
 # sedproxy 0.7.5.1
 * fix bug in mixed layer modelling where top of core is assumed to be age == 0
 

R/ClimToProxyClim.R

@@ -1003,7 +1003,7 @@ MakePFMDataframe <- function(PFM){
   rtn <- dplyr::bind_rows(df, df2, df.smoothed)
 
   rtn <- droplevels(dplyr::filter(rtn, stats::complete.cases(.data$value)))
-  rtn <- dplyr::left_join(rtn, dplyr::select(sedproxy::stages.key, stage, scale, .data$label), by = "stage")
+  rtn <- dplyr::left_join(rtn, dplyr::select(sedproxy::stages.key, stage, scale, "label"), by = "stage")
   #rtn <- select(rtn, -plotting.colour, -plotting.alpha)
 
   return(rtn)

R/sedproxy.R

@@ -1,9 +1,8 @@
 #' sedproxy: Simulation of Sediment Archived Climate Proxy Records
 #'
 #' The sedproxy package provides functions to simulate sediment archived proxies
-#' @docType package
 #' @name sedproxy
-NULL
+"_PACKAGE"
 
 #' @title Description of proxy stages
 #' @description A description of the proxy stages in the output of \code{ClimToProxyClim}

README.md

@@ -193,20 +193,20 @@ PFM <- ClimToProxyClim(clim.signal = clim.in,
 PFM$everything
 ```
 
-    ## # A tibble: 14,045 x 7
+    ## # A tibble: 14,045 × 7
     ##    timepoints n.samples replicate stage             value scale       label     
     ##         <dbl>     <dbl>     <dbl> <chr>             <dbl> <chr>       <chr>     
-    ##  1       4334        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia~
-    ##  2       4527        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia~
-    ##  3       4576        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia~
-    ##  4       4721        30         1 proxy.bt.sb.sampY  27.6 Proxy units (4) +Alia~
-    ##  5       4914        30         1 proxy.bt.sb.sampY  27.6 Proxy units (4) +Alia~
-    ##  6       4994        30         1 proxy.bt.sb.sampY  27.6 Proxy units (4) +Alia~
-    ##  7       5092        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia~
-    ##  8       5156        30         1 proxy.bt.sb.sampY  27.6 Proxy units (4) +Alia~
-    ##  9       5254        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia~
-    ## 10       5318        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia~
-    ## # ... with 14,035 more rows
+    ##  1       4334        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia…
+    ##  2       4527        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia…
+    ##  3       4576        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia…
+    ##  4       4721        30         1 proxy.bt.sb.sampY  27.6 Proxy units (4) +Alia…
+    ##  5       4914        30         1 proxy.bt.sb.sampY  27.6 Proxy units (4) +Alia…
+    ##  6       4994        30         1 proxy.bt.sb.sampY  27.6 Proxy units (4) +Alia…
+    ##  7       5092        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia…
+    ##  8       5156        30         1 proxy.bt.sb.sampY  27.6 Proxy units (4) +Alia…
+    ##  9       5254        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia…
+    ## 10       5318        30         1 proxy.bt.sb.sampY  27.7 Proxy units (4) +Alia…
+    ## # ℹ 14,035 more rows
 
 **Simple plotting**
 
@@ -215,9 +215,9 @@ PFM %>%
   PlotPFMs(max.replicates = 1)
 ```
 
-    ## Joining, by = c("stage", "scale")
-    ## Scale for 'alpha' is already present. Adding another scale for 'alpha', which
-    ## will replace the existing scale.
+    ## Joining with `by = join_by(stage, scale)`
+    ## Scale for alpha is already present. Adding another scale for alpha, which will
+    ## replace the existing scale.
 
 <img src="man/figures/README-default_plot-1.svg" width="100%" />
 
@@ -229,9 +229,9 @@ PFM %>%
   PlotPFMs(., max.replicates = 5, plot.stages = "simulated.proxy")
 ```
 
-    ## Joining, by = c("stage", "scale")
-    ## Scale for 'alpha' is already present. Adding another scale for 'alpha', which
-    ## will replace the existing scale.
+    ## Joining with `by = join_by(stage, scale)`
+    ## Scale for alpha is already present. Adding another scale for alpha, which will
+    ## replace the existing scale.
 
 <img src="man/figures/README-plot_reps-1.svg" width="100%" />
 
@@ -243,9 +243,9 @@ Sensor stage of the proxy system.
 
     ## Rescaling noise
 
-    ## Joining, by = c("stage", "scale")
-    ## Scale for 'alpha' is already present. Adding another scale for 'alpha', which
-    ## will replace the existing scale.
+    ## Joining with `by = join_by(stage, scale)`
+    ## Scale for alpha is already present. Adding another scale for alpha, which will
+    ## replace the existing scale.
 
 <img src="man/figures/README-MgCa_plot-1.svg" width="100%" />