Merge branch 'master' of github.com:flyconnectome/hemibrainr

.github/workflows/R-CMD-check.yaml

@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
 

DESCRIPTION

@@ -31,7 +31,12 @@ Suggests:
     fastcluster,
     reticulate,
     doParallel,
-    qs
+    qs,
+    rdrop2,
+    arrow,
+    doSNOW,
+    ggplot2,
+    gridExtra
 VignetteBuilder: knitr
 Depends:
     R (>= 3.1),
@@ -58,7 +63,6 @@ Imports:
     jpeg,
     png,
     googledrive,
-    rdrop2,
     jsonlite,
     plyr,
     catmaid,
@@ -83,8 +87,10 @@ Remotes:
     natverse/nat.nblast,
     natverse/nat,
     natverse/nat.flybrains,
-    schlegelp/nat.hdf5
+    schlegelp/nat.hdf5,
+    karthik/rdrop2,
+    dbaston/bitsqueezr
 Language: en-GB
-RoxygenNote: 7.2.1
+RoxygenNote: 7.3.1
 URL: https://github.com/flyconnectome/hemibrainr, https://flyconnectome.github.io/hemibrainr
 BugReports: https://github.com/flyconnectome/hemibrainr/issues

NAMESPACE

@@ -264,6 +264,10 @@ importFrom(rgl,spheres3d)
 importFrom(rlang,.data)
 importFrom(stats,ave)
 importFrom(stats,dist)
+importFrom(stats,na.omit)
+importFrom(stats,offset)
 importFrom(stats,sd)
 importFrom(utils,download.file)
 importFrom(utils,installed.packages)
+importFrom(utils,setTxtProgressBar)
+importFrom(utils,txtProgressBar)

R/hemibrain_synapses.R

@@ -569,7 +569,7 @@ hemibrain_ntplot.neuronlist <- function(x,
     do.call(gridExtra::grid.arrange, c(plist, ncol=nCol))
   }else{
     syns.nt = lapply(x, function(y) y$connectors)
-    syns.nt = do.call(pluyr::rbind.fill, syns.nt)
+    syns.nt = do.call(plyr::rbind.fill, syns.nt)
     syns.nt$id = "collapse"
     hemibrain_ntplot.data.frame(syns.nt)
   }

R/hemibrainr-package.R

@@ -5,5 +5,9 @@
 # The following block is used by usethis to automatically manage
 # roxygen namespace tags. Modify with care!
 ## usethis namespace: start
+#' @importFrom stats na.omit
+#' @importFrom stats offset
+#' @importFrom utils setTxtProgressBar
+#' @importFrom utils txtProgressBar
 ## usethis namespace: end
 NULL

R/utilities-gdrive.R

@@ -286,6 +286,8 @@ remote_upload <- function(file,
                                verbose = verbose)
       }
     }else if(remote=="dropbox"){
+      if(!requireNamespace('rdrop2', quietly = T))
+        stop("Please install suggested package rdrop2 to use Dropbox")
       rdrop2::drop_upload(file = file,
                           path = path,
                           mode = "overwrite",

R/zzz.R

@@ -33,7 +33,7 @@
   }
 
   # Set googlesheets API key
-  try(hemibrainr_google_login())
+  # try(hemibrainr_google_login())
 
   # Set Google sheets of interest
   hemibrainr_matching_gsheet = ifelse(!is.null(getOption("hemibrainr_matching_gsheet")),getOption("hemibrainr_matching_gsheet"),"1OSlDtnR3B1LiB5cwI5x5Ql6LkZd8JOS5bBr-HTi0pOw")