Merge branch 'main' into devel

pachterlab · Nov 8, 2024 · 8a6e033 · 8a6e033
2 parents 804db65 + ca9e470
commit 8a6e033
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -36,7 +36,7 @@ jobs:
       - uses: r-lib/actions/setup-pandoc@v2
 
       - if: runner.os == 'macOS'
-        run: brew install apache-arrow fftw jpeg libtiff imagemagick
+        run: brew install apache-arrow fftw jpeg libtiff imagemagick pkg-config
 
       - name: Setup R and Bioconductor
         uses: grimbough/bioc-actions/setup-bioc@v1

diff --git a/tests/testthat/test.R b/tests/testthat/test.R
@@ -95,7 +95,12 @@ test_that("Save and read single file BioFormatsImage", {
     expect_equal(transformation(bfi), transformation(bfi2))
     origin <- SpatialFeatureExperiment::origin
     expect_equal(origin(bfi), origin(bfi2), ignore_attr = "names")
-    expect_equal(imgSource(bfi2), normalizePath(file.path(fsave, "image.ome.tif")))
+    if (Sys.info()['sysname'] == "Windows") {
+        spl1 <- strsplit(imgSource(bfi2), "[(\\)/]")[[1]]
+        spl2 <- strsplit(normalizePath(file.path(fsave, "image.ome.tif")), "[(\\)/]")[[1]]
+        expect_equal(tail(spl1, 3), tail(spl2,3))
+    } else
+        expect_equal(imgSource(bfi2), normalizePath(file.path(fsave, "image.ome.tif")))
     unlink(fsave, recursive = TRUE)
 })