set getOption("stringsAsFactors") to FALSE by default (required b…

…y R-devel)
briatte · Mar 6, 2023 · 5b6ed24 · 5b6ed24
1 parent 8145424
commit 5b6ed24
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 59 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,8 +2,8 @@ Package: ggnetwork
 Type: Package
 Title: Geometries to Plot Networks with 'ggplot2'
 Description: Geometries to plot network objects with 'ggplot2'.
-Version: 0.5.10
-Date: 2021-07-05
+Version: 0.5.12
+Date: 2023-03-06
 Maintainer: François Briatte <f.briatte@gmail.com>
 Authors@R: c(
   person("François", "Briatte", email = "f.briatte@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-6494-9774")),
@@ -38,7 +38,7 @@ Collate:
     'geom-edges.R'
     'ggnetwork.R'
 VignetteBuilder: knitr
-RoxygenNote: 7.1.1
+RoxygenNote: 7.2.1
 Roxygen: list(markdown = TRUE)
 Encoding: UTF-8
 NeedsCompilation: no
diff --git a/NEWS.md b/NEWS.md
@@ -1,10 +1,16 @@
+ggnetwork 0.5.12 (2023-03-06)
+=============================
+
+## Minor improvements and fixes
+
+* Fortifying graph objects now assumes that `getOption("stringsAsFactors")` is to be set to `FALSE` when it is missing (required by a recent change in R-devel).
+
 ggnetwork 0.5.11 (2021-07-06)
 =============================
 
 ## Repository changes
 
 * Replaced Travis CI with GitHub Actions (#66).
-* Started using [`renv`](https://rstudio.github.io/renv/articles/renv.html) for [that purpose](https://rstudio.github.io/renv/articles/ci.html).
 
 ggnetwork 0.5.10 (2021-07-05)
 =============================

diff --git a/R/fortify-igraph.R b/R/fortify-igraph.R
@@ -20,7 +20,7 @@ fortify.igraph <- function(
   arrow.gap = ifelse(igraph::is.directed(model), 0.025, 0),
   by = NULL,
   scale = TRUE,
-  stringsAsFactors = getOption("stringsAsFactors"),
+  stringsAsFactors = getOption("stringsAsFactors", FALSE),
   ...
 ) {
   # node placement

diff --git a/R/fortify-network.R b/R/fortify-network.R
@@ -103,7 +103,7 @@ fortify.network <- function(
   arrow.gap = ifelse(network::is.directed(model), 0.025, 0),
   by = NULL,
   scale = TRUE,
-  stringsAsFactors = getOption("stringsAsFactors"),
+  stringsAsFactors = getOption("stringsAsFactors", FALSE),
   ...
 ) {
   # node placement

diff --git a/R/utilities.R b/R/utilities.R
@@ -110,8 +110,8 @@ NULL
 #'   meaningful spatial coordinates, such as latitude and longitude.
 #' @param stringsAsFactors whether vertex and edge attributes should be
 #'   converted to factors if they are of class \code{character}. Defaults to
-#'   the value of \code{getOption("stringsAsFactors")}, which is \code{TRUE} by
-#'   default: see \code{\link[base]{data.frame}}.
+#'   the value of \code{getOption("stringsAsFactors")}, which is \code{FALSE}
+#'   by default: see \code{\link[base]{data.frame}}.
 #' @param .list_vertex_attributes_fun a "list vertex attributes" function.
 #' @param .get_vertex_attributes_fun a "get vertex attributes" function.
 #' @param .list_edges_attributes_fun a "get edges attributes" function.
@@ -129,7 +129,7 @@ format_fortify <- function(
   arrow.gap = ifelse(network::is.directed(model), 0.025, 0),
   by = NULL,
   scale = TRUE,
-  stringsAsFactors = getOption("stringsAsFactors"),
+  stringsAsFactors = getOption("stringsAsFactors", FALSE),
   .list_vertex_attributes_fun = NULL,
   .get_vertex_attributes_fun = NULL,
   .list_edges_attributes_fun = NULL,

diff --git a/man/format_fortify.Rd b/man/format_fortify.Rd
diff --git a/man/fortify.igraph.Rd b/man/fortify.igraph.Rd
diff --git a/man/fortify.network.Rd b/man/fortify.network.Rd
diff --git a/man/geom_edges.Rd b/man/geom_edges.Rd
diff --git a/man/geom_edgetext.Rd b/man/geom_edgetext.Rd
diff --git a/man/geom_edgetext_repel.Rd b/man/geom_edgetext_repel.Rd
diff --git a/man/geom_nodes.Rd b/man/geom_nodes.Rd
diff --git a/man/geom_nodetext.Rd b/man/geom_nodetext.Rd
diff --git a/man/geom_nodetext_repel.Rd b/man/geom_nodetext_repel.Rd
diff --git a/tests/testthat/testthat-problems.rds b/tests/testthat/testthat-problems.rds