Merge pull request #81 from tidymodels/print_step

Use print_step instead of printer

.github/workflows/R-CMD-check.yaml

@@ -37,19 +37,19 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@v1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: rcmdcheck
 
-      - uses: r-lib/actions/check-r-package@v1
+      - uses: r-lib/actions/check-r-package@v2
 
       - name: Show testthat output
         if: always()

.github/workflows/pkgdown.yaml

@@ -1,45 +1,46 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
-# Add Config/Needs/website: tidyverse/tidytemplate to DESCRIPTION
 on:
   push:
     branches: [main, master]
-    tags: ['*']
   pull_request:
     branches: [main, master]
+  release:
+    types: [published]
+  workflow_dispatch:
 
 name: pkgdown
 
 jobs:
   pkgdown:
     runs-on: ubuntu-latest
+    # Only restrict concurrency for non-PR jobs
+    concurrency:
+      group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@v1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: pkgdown
+          extra-packages: any::pkgdown, local::.
           needs: website
 
-      - name: Install package
-        run: R CMD INSTALL .
-
       - name: Build site
-        if: github.event_name == 'pull_request'
-        run: |
-          Rscript -e 'pkgdown::build_site()'
+        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
+        shell: Rscript {0}
 
-      - name: Deploy package
-        if: github.event_name == 'push'
-        run: |
-          git config --local user.name "$GITHUB_ACTOR"
-          git config --local user.email "[email protected]"
-          Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
+      - name: Deploy to GitHub pages 🚀
+        if: github.event_name != 'pull_request'
+        uses: JamesIves/[email protected]
+        with:
+          clean: false
+          branch: gh-pages
+          folder: docs

.github/workflows/test-coverage.yaml

@@ -17,11 +17,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@v1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: covr
 

NAMESPACE

@@ -75,7 +75,7 @@ importFrom(recipes,bake)
 importFrom(recipes,check_type)
 importFrom(recipes,is_trained)
 importFrom(recipes,prep)
-importFrom(recipes,printer)
+importFrom(recipes,print_step)
 importFrom(recipes,rand_id)
 importFrom(recipes,recipes_eval_select)
 importFrom(recipes,sel2char)

R/0_imports.R

@@ -2,7 +2,7 @@
 #' @importFrom generics tidy
 #' @importFrom purrr map_dfr map_lgl
 #' @importFrom recipes add_step bake check_type is_trained prep
-#' @importFrom recipes printer rand_id sel2char step recipes_eval_select
+#' @importFrom recipes print_step rand_id sel2char step recipes_eval_select
 #' @importFrom rlang := enquos
 #' @importFrom ROSE ROSE
 #' @importFrom tibble as_tibble tibble

R/step_adasyn.R

@@ -186,8 +186,8 @@ bake.step_adasyn <- function(object, new_data, ...) {
 #' @export
 print.step_adasyn <-
   function(x, width = max(20, options()$width - 26), ...) {
-    cat("adasyn based on ", sep = "")
-    printer(x$column, x$terms, x$trained, width = width)
+    title <- "adasyn based on "
+    print_step(x$column, x$terms, x$trained, title, width)
     invisible(x)
   }
 

R/step_bsmote.R

@@ -220,8 +220,8 @@ bake.step_bsmote <- function(object, new_data, ...) {
 #' @export
 print.step_bsmote <-
   function(x, width = max(20, options()$width - 26), ...) {
-    cat("BorderlineSMOTE based on ", sep = "")
-    printer(x$column, x$terms, x$trained, width = width)
+    title <- "BorderlineSMOTE based on "
+    print_step(x$column, x$terms, x$trained, title, width)
     invisible(x)
   }
 

R/step_downsample.R

@@ -223,8 +223,8 @@ bake.step_downsample <- function(object, new_data, ...) {
 
 print.step_downsample <-
   function(x, width = max(20, options()$width - 26), ...) {
-    cat("Down-sampling based on ", sep = "")
-    printer(x$column, x$terms, x$trained, width = width)
+    title <- "Down-sampling based on "
+    print_step(x$column, x$terms, x$trained, title, width)
     invisible(x)
   }
 

R/step_nearmiss.R

@@ -197,8 +197,8 @@ bake.step_nearmiss <- function(object, new_data, ...) {
 #' @export
 print.step_nearmiss <-
   function(x, width = max(20, options()$width - 26), ...) {
-    cat("NEARMISS-1 based on ", sep = "")
-    printer(x$column, x$terms, x$trained, width = width)
+    title <- "NEARMISS-1 based on "
+    print_step(x$column, x$terms, x$trained, title, width)
     invisible(x)
   }
 

R/step_rose.R

@@ -216,8 +216,8 @@ bake.step_rose <- function(object, new_data, ...) {
 #' @export
 print.step_rose <-
   function(x, width = max(20, options()$width - 26), ...) {
-    cat("ROSE based on ", sep = "")
-    printer(x$column, x$terms, x$trained, width = width)
+    title <- "ROSE based on "
+    print_step(x$column, x$terms, x$trained, title, width)
     invisible(x)
   }
 

R/step_smote.R

@@ -193,8 +193,8 @@ bake.step_smote <- function(object, new_data, ...) {
 #' @export
 print.step_smote <-
   function(x, width = max(20, options()$width - 26), ...) {
-    cat("SMOTE based on ", sep = "")
-    printer(x$column, x$terms, x$trained, width = width)
+    title <- "SMOTE based on "
+    print_step(x$column, x$terms, x$trained, title, width)
     invisible(x)
   }
 

R/step_tomek.R

@@ -190,8 +190,8 @@ bake.step_tomek <- function(object, new_data, ...) {
 #' @export
 print.step_tomek <-
   function(x, width = max(20, options()$width - 26), ...) {
-    cat("Tomek based on ", sep = "")
-    printer(x$column, x$terms, x$trained, width = width)
+    title <- "Tomek based on "
+    print_step(x$column, x$terms, x$trained, title, width)
     invisible(x)
   }
 

R/step_upsample.R

@@ -218,8 +218,8 @@ bake.step_upsample <- function(object, new_data, ...) {
 
 print.step_upsample <-
   function(x, width = max(20, options()$width - 26), ...) {
-    cat("Up-sampling based on ", sep = "")
-    printer(x$column, x$terms, x$trained, width = width)
+    title <- "Up-sampling based on "
+    print_step(x$column, x$terms, x$trained, title, width)
     invisible(x)
   }