Updates to workflow Install fafbseg + python

flyconnectome · Sep 24, 2024 · b351635 · b351635
1 parent 8800138
commit b351635
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -50,7 +50,8 @@ jobs:
           pak::local_install()
           library(fafbseg)
           simple_python()
-          dr_fafbseg()
+          simple_python('none', pkgs='cloud-volume~=8.32.1')
+          dr_banc()
         shell: Rscript {0}
 
       - name: writetoken

diff --git a/R/ggplot2.R b/R/ggplot2.R
@@ -143,7 +143,7 @@ banc_neuron_comparison_plot <- function(neuron1 = NULL,
     if(length(neuron2)==1){
       cols2 <- c("darkred", "#F88379")
     }else{
-      cols2 <- grDevices::colorRampPalette(c("#8f0723","#DC143C","#FF4500","#FF7F50:","#F88379","#FFB6C1","#FF69B4"))(length(neuron2))
+      cols2 <- grDevices::colorRampPalette(c("#8f0723","#DC143C","#FF4500","#FF7F50","#F88379","#FFB6C1","#FF69B4"))(length(neuron2))
     }
     if(length(neuron3)==1){
       cols3 <- c("darkgreen", "green")

diff --git a/R/urls.R b/R/urls.R
@@ -138,15 +138,15 @@ bancsee <- function(banc_ids = NULL,
   old_warn <- options(warn = -1)  # Suppress all warnings
   on.exit(options(old_warn))  # Restore warning settings when function exits
   banc_ids <- banc_ids[!is.na(banc_ids)]
-  banc_ids <- banc_ids[banc_ids!="0"]
+  banc_ids <- banc_ids[!banc_ids%in%c("0","","NA")]
   fafb_ids <- fafb_ids[!is.na(fafb_ids)]
-  fafb_ids <- fafb_ids[fafb_ids!="0"]
+  fafb_ids <- fafb_ids[!fafb_ids%in%c("0","","NA")]
   hemibrain_ids <- hemibrain_ids[!is.na(hemibrain_ids)]
-  hemibrain_ids <- hemibrain_ids[hemibrain_ids!="0"]
+  hemibrain_ids <- hemibrain_ids[!hemibrain_ids%in%c("0","","NA")]
   manc_ids <- manc_ids[!is.na(manc_ids)]
-  manc_ids <- manc_ids[manc_ids!="0"]
+  manc_ids <- manc_ids[!manc_ids%in%c("0","","NA")]
   nuclei_ids <- nuclei_ids[!is.na(nuclei_ids)]
-  nuclei_ids <- nuclei_ids[nuclei_ids!="0"]
+  nuclei_ids <- nuclei_ids[!nuclei_ids%in%c("0","","NA")]
 
   # Get BANC IDs
   if(length(banc_ids)){