Merge branch 'develop' into update-gha-workflows

r-hyperspec · Mar 7, 2024 · 1638ab1 · 1638ab1
2 parents 3c23b18 + 310543f
commit 1638ab1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -46,14 +46,25 @@ jobs:
       - name: Install dependencies (for R-devel)
         if: matrix.config.r == 'devel'
         run: |
-          install.packages("vdiffr", type = "source")
+          remotes::install_cran("vdiffr", type = "source", force = TRUE)
         shell: Rscript {0}
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: any::rcmdcheck, any::devtools, local::.
           needs: check
 
+      - name: "Install roxygen2==7.2.3"
+        run: |
+          remotes::install_version("roxygen2", "7.2.3")
+        shell: Rscript {0}
+
+      - name: Install dependencies (for R-devel)
+        if: matrix.config.r == 'devel'
+        run: |
+          remotes::install_cran("vdiffr", type = "source", force = TRUE)
+        shell: Rscript {0}
+
       - name: Install dependencies (for R-oldrel)
         if: matrix.config.r == 'oldrel' || matrix.config.r == '3.6'
         run: |

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -45,6 +45,11 @@ jobs:
           extra-packages: any::covr, any::devtools, any::roxygen2
           needs: coverage
 
+      - name: "Install roxygen2==7.2.3"
+        run: |
+          remotes::install_version("roxygen2", "7.2.3")
+        shell: Rscript {0}
+
       - name: Roxygenize
         shell: Rscript {0}
         run: |

diff --git a/R/DEPRECATED-read.spc.R b/R/DEPRECATED-read.spc.R
@@ -552,7 +552,7 @@ raw.split.nul <- function(raw, trunc = c(TRUE, TRUE), firstonly = FALSE, paste.c
     }
     log.txt[log.txt == .nul] <- replace.nul
     log.txt <- readChar(log.txt, length(log.txt), useBytes = T)
-    log.txt <- gsub(rawToChar(replace.nul), "\r\n", log.txt)
+    log.txt <- gsub(rawToChar(replace.nul), "\r\n", log.txt, useBytes=TRUE)
     log.txt <- iconv(log.txt, iconv.from, iconv.to)
     log.txt <- split.string(log.txt, "\r\n") ## spc file spec says \r\n regardless of OS
     log.txt <- split.line(log.txt, "=")

diff --git a/R/hyperspec-package.R b/R/hyperspec-package.R
@@ -11,7 +11,6 @@
 #' `absorbance = f(wavelength)`, stored as a vector of absorbance values for
 #' discrete wavelengths is suitable.
 #'
-#' @docType package
 #' @author C. Beleites
 #'
 #' Maintainer: Claudia Beleites <claudia.beleites@@chemometrix.eu>
@@ -32,4 +31,5 @@
 #' @keywords package
 #' @concept hyperSpec-main
 
-NULL
+"_PACKAGE"
+