diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 5bcca714..7ee1f228 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -10,7 +10,7 @@ jobs: R-CMD-check: runs-on: ${{ matrix.config.os }} - name: ${{ matrix.config.os }} (${{ matrix.config.r }} - ${{ matrix.config.rust-version }}) + name: R-CMD-Check ${{ matrix.config.os }} (${{ matrix.config.r }} - ${{ matrix.config.rust-version }}) strategy: fail-fast: false @@ -34,8 +34,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: r-lib/actions/setup-pandoc@v2 - - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.config.rust-version }} diff --git a/.github/workflows/test_pkg_gen.yaml b/.github/workflows/test_pkg_gen.yaml index c55af1df..8909bd27 100644 --- a/.github/workflows/test_pkg_gen.yaml +++ b/.github/workflows/test_pkg_gen.yaml @@ -14,7 +14,7 @@ jobs: R-CMD-check: runs-on: ${{ matrix.config.os }} - name: ${{ matrix.config.os }} (${{ matrix.config.r }} / ${{ matrix.config.rust-version }}) + name: PkgGen ${{ matrix.config.os }} (${{ matrix.config.r }} - ${{ matrix.config.rust-version }}) strategy: fail-fast: false @@ -50,9 +50,6 @@ jobs: # TODO: enable RSPM when all the packages are available use-public-rspm: false - - name: Set up pandoc - uses: r-lib/actions/setup-pandoc@v2 - - uses: r-lib/actions/setup-r-dependencies@v2 with: # increment this version number when we need to clear the cache diff --git a/R/features.R b/R/features.R index bd275e84..c75d31c8 100644 --- a/R/features.R +++ b/R/features.R @@ -1,5 +1,5 @@ features_config <- rlang::env( - known_features = c("ndarray", "serde", "either", "num-complex", "graphics") + known_features = c("ndarray", "faer", "serde", "either", "num-complex", "graphics") ) validate_extendr_features <- function(features, suppress_warnings) { diff --git a/R/source.R b/R/source.R index 8cc564cf..263b5fac 100644 --- a/R/source.R +++ b/R/source.R @@ -22,7 +22,7 @@ #' otherwise, uses `rextendr.extendr_dev_deps` option #' (\code{list(`extendr-api` = list(git = "https://github.com/extendr/extendr")}). #' @param features A vector of `extendr-api` features that should be enabled. -#' Supported values are `"ndarray"`, `"num-complex"`, `"serde"`, and `"graphics"`. +#' Supported values are `"ndarray"`, `"faer"`, `"either"`, `"num-complex"`, `"serde"`, and `"graphics"`. #' Unknown features will produce a warning if `quiet` is not `TRUE`. #' @param env The R environment in which the wrapping functions will be defined. #' @param use_extendr_api Logical indicating whether diff --git a/R/utils.R b/R/utils.R index 931fd7f8..9717ea49 100644 --- a/R/utils.R +++ b/R/utils.R @@ -38,7 +38,7 @@ local_quiet_cli <- function(quiet, env = rlang::caller_env()) { #' @return Logical scalar indicating if the command was available. #' @noRd cargo_command_available <- function(args = "--help") { - !any(is.na(try_exec_cmd("cargo", args))) + !anyNA(try_exec_cmd("cargo", args)) } #' Helper function for executing commands. diff --git a/tests/testthat/_snaps/license_note.md b/tests/testthat/_snaps/license_note.md index 1ae14dd4..d2757ccb 100644 --- a/tests/testthat/_snaps/license_note.md +++ b/tests/testthat/_snaps/license_note.md @@ -17,7 +17,7 @@ Name: extendr-macros Repository: https://github.com/extendr/extendr - Authors: andy-thomason, Thomas Down, Mossa Merhi Reimert, Claus O. Wilke, Hiroaki Yutani, Ilia A. Kosenkov + Authors: andy-thomason, Thomas Down, Mossa Merhi Reimert, Claus O. Wilke, Hiroaki Yutani, Ilia A. Kosenkov, Michael Milton License: MIT -------------------------------------------------------------