From ca4a9b90755ea6a4c6e9c8cef25acf91a21d4682 Mon Sep 17 00:00:00 2001 From: Craig Williams Date: Wed, 29 Nov 2023 16:18:48 +0000 Subject: [PATCH] Dirty commit to add "stringsAsFactors = FALSE" for earlier versions of R --- DESCRIPTION | 2 +- R/list_depends.R | 2 +- R/list_imports.R | 5 +++-- R/restore.R | 6 +++--- R/utils.R | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2d72ea3..1daf972 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: Rpacman Type: Package Title: Very simple package manager for R -Version: 1.0.6 +Version: 1.0.7 Date: 2022-05-31 Authors@R: person("Craig", "Williams", email = "craig@avsdev.uk", role = c("aut", "cre")) URL: https://avsdev.uk/R/Rpacman diff --git a/R/list_depends.R b/R/list_depends.R index b2bf90e..feef367 100644 --- a/R/list_depends.R +++ b/R/list_depends.R @@ -1,7 +1,7 @@ .list_depends <- function(packages, gen) { allPackages <- utils::installed.packages() - allPackages <- as.data.frame(allPackages) + allPackages <- as.data.frame(allPackages, stringsAsFactors = FALSE) packages <- allPackages[allPackages$Package %in% packages,] packages <- packages[,c("Package", "Version", "Imports", "Depends", "LinkingTo")] diff --git a/R/list_imports.R b/R/list_imports.R index b047e16..70fd4e1 100644 --- a/R/list_imports.R +++ b/R/list_imports.R @@ -9,11 +9,12 @@ list_imports <- function() { packages <- renv::dependencies(progress = FALSE)$Package packages <- sort(unique(packages)) allPackages <- utils::installed.packages() - allPackages <- as.data.frame(allPackages) + allPackages <- as.data.frame(allPackages, stringsAsFactors = FALSE) allPackages <- allPackages[allPackages$Package %in% packages,] packages <- data.frame( package = allPackages$Package, - version = allPackages$Version + version = allPackages$Version, + stringsAsFactors = FALSE ) return(packages) } \ No newline at end of file diff --git a/R/restore.R b/R/restore.R index cb90cf6..fe416ef 100644 --- a/R/restore.R +++ b/R/restore.R @@ -1,7 +1,7 @@ # Requires activate.R .install_if_missing <- function(packages, installOpts, lockVersion = TRUE, parallel = FALSE) { - installedPackages <- as.data.frame(utils::installed.packages()[,c("Package","Version")]) + installedPackages <- as.data.frame(utils::installed.packages()[,c("Package","Version")], stringsAsFactors = FALSE) if (lockVersion) { packageMatch <- merge( packages, @@ -77,8 +77,8 @@ restore <- function(totalIsolation = FALSE, installOpts = list(Ncpus = parallel: simplePackages <- as.data.frame(apply(rbind( do.call(rbind, requiredPackages$direct), do.call(rbind, requiredPackages$indirect) - ), 2, unlist)) - customPackages <- as.data.frame(do.call(rbind, requiredPackages$custom)) + ), 2, unlist), stringsAsFactors = FALSE) + customPackages <- as.data.frame(do.call(rbind, requiredPackages$custom), stringsAsFactors = FALSE) # corePackages <- as.data.frame(apply(do.call(rbind, lastSnapshot$packages$core), 2, unlist)) diff --git a/R/utils.R b/R/utils.R index 43e2354..ad29842 100644 --- a/R/utils.R +++ b/R/utils.R @@ -75,7 +75,8 @@ empty_sources <- function() { version = character(0), type = character(0), src = character(0), - ref = character(0) + ref = character(0), + stringsAsFactors = FALSE ) }