Merge pull request #48 from swarm-lab/develop

Develop

.github/workflows/rhub.yaml

@@ -0,0 +1,95 @@
+# R-hub's generic GitHub Actions workflow file. It's canonical location is at
+# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml
+# You can update this file to a newer version using the rhub2 package:
+#
+# rhub::rhub_setup()
+#
+# It is unlikely that you need to modify this file manually.
+
+name: R-hub
+run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}"
+
+on:
+  workflow_dispatch:
+    inputs:
+      config:
+        description: 'A comma separated list of R-hub platforms to use.'
+        type: string
+        default: 'linux,windows,macos'
+      name:
+        description: 'Run name. You can leave this empty now.'
+        type: string
+      id:
+        description: 'Unique ID. You can leave this empty now.'
+        type: string
+
+jobs:
+
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      containers: ${{ steps.rhub-setup.outputs.containers }}
+      platforms: ${{ steps.rhub-setup.outputs.platforms }}
+
+    steps:
+    # NO NEED TO CHECKOUT HERE
+    - uses: r-hub/actions/setup@v1
+      with:
+        config: ${{ github.event.inputs.config }}
+      id: rhub-setup
+
+  linux-containers:
+    needs: setup
+    if: ${{ needs.setup.outputs.containers != '[]' }}
+    runs-on: ubuntu-latest
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.containers) }}
+    container:
+      image: ${{ matrix.config.container }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+
+  other-platforms:
+    needs: setup
+    if: ${{ needs.setup.outputs.platforms != '[]' }}
+    runs-on: ${{ matrix.config.os }}
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.platforms) }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/setup-r@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: ROpenCVLite
 Type: Package
 Title: Helper Package for Installing OpenCV with R
-Version: 4.90.1
-Date: 2024-01-20
+Version: 4.90.2
+Date: 2024-08-01
 Authors@R: c(
     person("Simon", "Garnier", email = "[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-3886-3974")),
@@ -18,11 +18,10 @@ License: GPL-3
 LazyData: TRUE
 Imports:
     utils,
-    pkgbuild,
     parallel
 SystemRequirements: 
   cmake
-RoxygenNote: 7.3.0
+RoxygenNote: 7.3.2
 Biarch: false
 Encoding: UTF-8
 Depends:

NEWS.md

@@ -1,3 +1,15 @@
+# ROpenCVLite 4.90.2
+
+## New features
+
+* N/A.
+
+## Minor improvements and fixes
+
+* Removes pkgbuild dependency. 
+
+---
+
 # ROpenCVLite 4.90.1
 
 ## New features

R/install.R

@@ -34,19 +34,9 @@ defaultOpenCVPath <- function() {
     config$os <- gsub("\r", "", gsub("Caption=", "", system('wmic os get Caption,CSDVersion /value', intern = TRUE)[3]))
     config$core <- paste0("https://github.com/opencv/opencv/archive/", version, ".tar.gz")
     config$contrib <- paste0("https://github.com/opencv/opencv_contrib/archive/", version, ".tar.gz")
-    config$rtools_path <- utils::shortPathName(pkgbuild::rtools_path()[1])
-
-    if (is.null(config$rtools_path))
-      stop("Rtools is missing.")
-
-    config$rtools_path <- gsub("\\\\usr\\\\bin", "", config$rtools_path)
-    config$rtools_version <- system(
-      paste0("powershell (Get-Item ", config$rtools_path, "/unins000.exe).VersionInfo.ProductVersion"),
-      intern = TRUE)
-    config$rtools_version <- gsub(" ", "", config$rtools_version)
-
-    if (is.na(config$rtools_version))
-      stop("Unsupported Rtools version.")
+    rtools <- .findRtools()
+    config$rtools_path <- rtools$path
+    config$rtools_version <- rtools$version
 
     if (config$rtools_version < "4.2") {
       config$cmake_path <- utils::shortPathName(system("where cmake.exe", intern = TRUE))

R/utils.R

@@ -218,3 +218,34 @@ opencvConfig <- function(output = "libs", arch = NULL) {
     stop("output should be either 'libs' or 'cflags'")
   }
 }
+
+
+.findRtools <- function() {
+  if (.Platform$OS.type != "windows") {
+    stop("Rtools is Windows only.")
+  }
+
+  if (version$major < 4) {
+    stop("ROpenCVLite requires a R version > 4.0.")
+  }
+
+  if (version$minor < 2) {
+    rtools <- "rtools40"
+  } else {
+    rtools <- paste0("rtools", sub("\\D*(\\d+).*", "\\1", paste0(version$major, version$minor)))
+  }
+
+  path <- strsplit(Sys.getenv("PATH"), ";")[[1]]
+  ix <- grep(rtools, path)[1]
+  rtools_path <- utils::shortPathName(sub(paste0("(", rtools, ").*"), "\\1", path[ix]))
+  rtools_version <- system(
+    paste0("powershell (Get-Item ", rtools_path, "/unins000.exe).VersionInfo.ProductVersion"),
+    intern = TRUE
+  )
+  rtools_version <- gsub(" ", "", rtools_version)
+
+  if (is.na(rtools_version))
+    stop("Rtools unavailable or unsupported Rtools version.")
+
+  list(path = unname(rtools_path), version = unname(rtools_version))
+}

cran-comments.md

@@ -1,17 +1,18 @@
 ## Test environments
 
-* local M1 OS X 14.2.1, R 4.0.5, 4.1.3, 4.2.3, 4.3.2, R devel
-* local Windows 10, R 4.0.5, 4.1.3, 4.2.3, 4.3.2, R devel
-* local Windows 11, R 4.0.5, 4.1.3, 4.2.3, 4.3.2, R devel
-* local Ubuntu 22.04, R 4.0.5, 4.1.3, 4.2.3, 4.3.2, R devel
+* local M1 OS X 14.2.1, R 4.0.5, 4.1.3, 4.2.3, 4.3.2, 4.4.1, R devel
+* local Windows 10, R 4.0.5, 4.1.3, 4.2.3, 4.3.2, 4.4.1, R devel
+* local Windows 11, R 4.0.5, 4.1.3, 4.2.3, 4.3.2, 4.4.1, R devel
+* local Ubuntu 24.04, R 4.0.5, 4.1.3, 4.2.3, 4.3.2, 4.4.1, R devel
 * Github Actions "windows-latest (release)"
 * Github Actions "macOS-latest (release)"
 * Github Actions "ubuntu-latest (release)"
 * Github Actions "ubuntu-latest (devel)"
 * Github Actions "ubuntu-latest (oldrel-1)"
-* r-hub Windows Server 2022, R-devel, 64 bit
-* r-hub Ubuntu Linux 20.04.1 LTS, R-release, GCC
-* r-hub Fedora Linux, R-devel, clang, gfortran
+* r-hub ubuntu-latest on GitHub
+* r-hub macos-13 on GitHub
+* r-hub macos-latest on GitHub
+* r-hub windows-latest on GitHub
 * win-builder.r-project.org
 
 ## R CMD check results