From 043b063ddbfb23e2623434770e2cb97a925288a2 Mon Sep 17 00:00:00 2001 From: Hans Chaudry <62669434+HansChaudry@users.noreply.github.com> Date: Fri, 10 Jun 2022 10:39:40 -0400 Subject: [PATCH] Issue170 fix (#177) * Update R version * enable pkgdown * updated eslint config path Signed-off-by: Chinmay Singh * eslint always enabled Signed-off-by: Chinmay Singh * enable all workflows Signed-off-by: Chinmay Singh * fall back to windows-2019 Signed-off-by: Chinmay Singh * update package pkgdown * updated renv packages snapshot * update renv * renv updgrade * updated workflows * updated renv lock file * fixing list to string conversion errors * dev version of rmarkdown * dev version of pkgdown * don't build vignettes * passing build args * fixed mutation unit tests * no error on warming * disable ubuntu devel * updated renv * installed npm packeges and changed position of workflow name * fixed typo * reverted the changes in these files: eslint.yml, node.js.yml, pkgdown.yaml, pylint.yml, package-lock.json * Minor changes to eslint.yml, pylint.yml, package-lock.json * new line to eslint.yml, and pylint.yml * new line changes to eslint.yml and pylint.yml * new line changes to eslint.yml and pylint.yml * fixed new line issues to eslint.yml and pylint.yml * removed isssue170_fix from push branches * Reverted changes in activate.R and renv.lock * disabled ubuntu Co-authored-by: Chinmay Singh --- .github/workflows/check-standard.yaml | 11 ++++++----- R/prep_specs_group_by.R | 2 +- R/prep_specs_mutate.R | 4 ++-- R/prep_specs_summarize.R | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml index 53a61bd9..ea499457 100644 --- a/.github/workflows/check-standard.yaml +++ b/.github/workflows/check-standard.yaml @@ -1,15 +1,16 @@ # For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. # https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions +name: R-CMD-check + on: push: branches: - main + pull_request: branches: - main -name: R-CMD-check - jobs: R-CMD-check: runs-on: ${{ matrix.config.os }} @@ -22,8 +23,8 @@ jobs: config: - {os: windows-latest, r: 'release'} - {os: macOS-latest, r: 'release'} - - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true @@ -73,7 +74,7 @@ jobs: _R_CHECK_CRAN_INCOMING_REMOTE_: false run: | options(crayon.enabled = TRUE) - rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") + rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran", "--no-build-vignettes"), build_args = c("--no-build-vignettes"), error_on = "error", check_dir = "check") shell: Rscript {0} - name: Upload check results diff --git a/R/prep_specs_group_by.R b/R/prep_specs_group_by.R index acfef3bb..c0afd99c 100644 --- a/R/prep_specs_group_by.R +++ b/R/prep_specs_group_by.R @@ -5,7 +5,7 @@ #' @inheritParams datamation_sanddance #' @inheritParams prep_specs_data #' @noRd -prep_specs_group_by <- function(.data, mapping, toJSON = TRUE, pretty = TRUE, height = 300, width = 300, mutation_before, ...) { +prep_specs_group_by <- function(.data, mapping, toJSON = TRUE, pretty = TRUE, height = 300, width = 300, mutation_before = FALSE, ...) { # Extract mapping ---- diff --git a/R/prep_specs_mutate.R b/R/prep_specs_mutate.R index fffc1b38..ee8adb75 100644 --- a/R/prep_specs_mutate.R +++ b/R/prep_specs_mutate.R @@ -37,7 +37,7 @@ prep_specs_mutate <- function(.data, mapping, toJSON = TRUE, pretty = TRUE, heig ) if(mutation_basis_on_variable) { - mutation_basis <- rlang::as_name(mutation_variables[1]) %>% + mutation_basis <- rlang::as_name(mutation_variables[[1]]) %>% rlang::parse_expr() mutation_basis_chr <- rlang::as_name(mutation_basis) @@ -50,7 +50,7 @@ prep_specs_mutate <- function(.data, mapping, toJSON = TRUE, pretty = TRUE, heig if(length(mutation_variables)>1) { - mutation_basis_two <- rlang::as_name(mutation_variables[2]) %>% + mutation_basis_two <- rlang::as_name(mutation_variables[[2]]) %>% rlang::parse_expr() mutation_basis_two_chr <- rlang::as_name(mutation_basis_two) diff --git a/R/prep_specs_summarize.R b/R/prep_specs_summarize.R index 3c4072b5..c350ef41 100644 --- a/R/prep_specs_summarize.R +++ b/R/prep_specs_summarize.R @@ -5,7 +5,7 @@ #' @inheritParams datamation_sanddance #' @inheritParams prep_specs_data #' @noRd -prep_specs_summarize <- function(.data, mapping, toJSON = TRUE, pretty = TRUE, height = 300, width = 300, mutation_before, ...) { +prep_specs_summarize <- function(.data, mapping, toJSON = TRUE, pretty = TRUE, height = 300, width = 300, mutation_before = FALSE, ...) { # Get summary function and variable