Merge from main

lambdamoses · lambdamoses · commit fb16c714bba9 · 2025-02-11T23:06:25.000-05:00
Merge branch 'main' into devel

# Conflicts:
#	DESCRIPTION
#	R/utils.R
diff --git a/R/utils.R b/R/utils.R
@@ -254,7 +254,7 @@ getTechTxFields <- function(tech, data_dir = NULL) {
             Vizgen = .check_vizgen_fns(data_dir, "detected_transcripts.csv"),
             CosMX = grep("tx_file.csv",
                          list.files(data_dir, pattern = "\\.csv.*$", full.names = TRUE),
-                         value = TRUE),
+                         value = TRUE)[1],
             Xenium = .check_xenium_fns(data_dir, "transcripts", .no_raw_bytes(data_dir))
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ getTechTxFields <- function(tech, data_dir = NULL) {`
`254`	`254`	`Vizgen = .check_vizgen_fns(data_dir, "detected_transcripts.csv"),`
`255`	`255`	`CosMX = grep("tx_file.csv",`
`256`	`256`	`list.files(data_dir, pattern = "\\.csv.*$", full.names = TRUE),`
`257`		`- value = TRUE),`
	`257`	`+ value = TRUE)[1],`
`258`	`258`	`Xenium = .check_xenium_fns(data_dir, "transcripts", .no_raw_bytes(data_dir))`
`259`	`259`	`)`
`260`	`260`	`}`