From 7e2f4f9625316d2f78f0f7e4cda5fe8ea34daeea Mon Sep 17 00:00:00 2001 From: AlreadyTakenJonas Date: Thu, 31 Aug 2023 15:43:49 +0200 Subject: [PATCH 1/4] fix #118 read.spc no longer fails and does its thing like the good ol times --- R/DEPRECATED-read.spc.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/DEPRECATED-read.spc.R b/R/DEPRECATED-read.spc.R index b49d6796..9c1118ff 100644 --- 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, "=") From 4b602a1a9f0f9b8925d9515a0d704e78e16a0396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Thu, 7 Mar 2024 11:23:33 +0200 Subject: [PATCH 2/4] Use `"_PACKAGE"` instead of `@docType package` --- R/hyperspec-package.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/hyperspec-package.R b/R/hyperspec-package.R index e006f325..12dc3ae3 100644 --- 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 @@ -32,4 +31,5 @@ #' @keywords package #' @concept hyperSpec-main -NULL +"_PACKAGE" + From d1f8ded221286797f8c7e4edb27b8700b64d4b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Thu, 7 Mar 2024 11:42:01 +0200 Subject: [PATCH 3/4] Force using `roxygen2==7.2.3` --- .github/workflows/R-CMD-check.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 14883ef5..9faac8b6 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -7,7 +7,7 @@ on: schedule: # (see https://crontab.guru) - cron: "5 3 * */2 WED" - + name: R-CMD-check jobs: @@ -48,6 +48,11 @@ jobs: 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: | From 3bc4b0f4aa6a868b5adb8a4f0c829b5806cd2d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Thu, 7 Mar 2024 12:37:15 +0200 Subject: [PATCH 4/4] Use `roxygen2==7.2.3` in codecov step --- .github/workflows/test-coverage.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 573fdf60..29d54cdd 100644 --- 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: |