From 355bede63ff0510bed8683b704b5a17f50013ee0 Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt <emilhhvitfeldt@gmail.com> Date: Fri, 20 Dec 2024 20:56:53 -0800 Subject: [PATCH 1/7] polish news --- NEWS.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index 98fd1da..1ed74b4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,16 +1,22 @@ # orbital (development version) -* `augment()` method for orbital object have been added. (#55) +* `orbital()` has gained `type` argument to change prediction type. (#66) + +* `orbital()` now works with `logistic_reg(engine = "glm")` models for class prediction and probability predictions. (#62, #66) + +* `orbital()` now works with `boost_tree(engine = "xgboost")` models for class prediction and probability predictions. (#71) + +* `orbital()` now works with `decision_tree(engine = "partykit")` models for class prediction and probability predictions. (#77) + +* `augment()` method for `orbital()` object have been added. (#55) * `orbital()` gained `prefix` argument to allow for renaming of prediction columns. (#59) -* `orbital()` now works with `logistic_reg()` models for class prediction and probability predictions. (#62, #66) -* `orbital()` has gained `type` argument to change prediction type. (#66) -* `orbital()` now works with `boost_tree(engine = "xgboost")` models for class prediction and probability predictions. (#71) -* `orbital()` now works with `decision_tree(engine = "partykit")` models for class prediction and probability predictions. (#77) + + # orbital 0.2.0 From da1a7f5766b9263ac1a8b7d7717436549df2931c Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt <emilhhvitfeldt@gmail.com> Date: Fri, 20 Dec 2024 21:03:10 -0800 Subject: [PATCH 2/7] render readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cdfa92..a2bf075 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ db_mtcars <- copy_to(con, mtcars) predict(orbital_obj, db_mtcars) #> # Source: SQL [?? x 1] -#> # Database: sqlite 3.46.0 [] +#> # Database: sqlite 3.47.0 [] #> .pred #> <dbl> #> 1 22.6 From 44d6a58e7426d63db2fb22977fd9dc53b04915d2 Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt <emilhhvitfeldt@gmail.com> Date: Fri, 20 Dec 2024 21:03:16 -0800 Subject: [PATCH 3/7] Increment version number to 0.3.0 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 98346b1..925b243 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: orbital Title: Predict with 'tidymodels' Workflows in Databases -Version: 0.2.0.9000 +Version: 0.3.0 Authors@R: c( person("Emil", "Hvitfeldt", , "emil.hvitfeldt@posit.co", role = c("aut", "cre")), person("Posit Software, PBC", role = c("cph", "fnd")) diff --git a/NEWS.md b/NEWS.md index 1ed74b4..9773b4c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# orbital (development version) +# orbital 0.3.0 * `orbital()` has gained `type` argument to change prediction type. (#66) From c660b113175e59b35f663dad2f71f04dc5f02615 Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt <emilhhvitfeldt@gmail.com> Date: Fri, 20 Dec 2024 21:03:48 -0800 Subject: [PATCH 4/7] fix more news --- NEWS.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index 9773b4c..4aa0bed 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,12 +12,6 @@ * `orbital()` gained `prefix` argument to allow for renaming of prediction columns. (#59) - - - - - - # orbital 0.2.0 * Support for `step_dummy()`, `step_impute_mean()`, `step_impute_median()`, `step_impute_mode()`, `step_unknown()`, `step_novel()`, `step_other()`, `step_BoxCox()`, `step_inverse()`, `step_mutate()`, `step_sqrt()`, `step_indicate_na()`, `step_range()`, `step_intercept()`, `step_ratio()`, `step_lag()`, `step_log()`, `step_rename()` has been added. (#17) From a0cf39d2b7af03ee86aaaf127ac264d83f795d73 Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt <emilhhvitfeldt@gmail.com> Date: Sat, 21 Dec 2024 08:42:07 -0800 Subject: [PATCH 5/7] add skip_on_cran() --- tests/testthat/test-augment.R | 1 + tests/testthat/test-model-partykit.R | 12 ++++++------ tests/testthat/test-step_adasyn.R | 2 ++ tests/testthat/test-step_bin2factor.R | 1 + tests/testthat/test-step_boxcox.R | 1 + tests/testthat/test-step_bsmote.R | 1 + tests/testthat/test-step_center.R | 1 + tests/testthat/test-step_discretize.R | 1 + tests/testthat/test-step_downsample.R | 1 + tests/testthat/test-step_dummy.R | 1 + tests/testthat/test-step_impute_mean.R | 1 + tests/testthat/test-step_impute_median.R | 1 + tests/testthat/test-step_impute_mode.R | 1 + tests/testthat/test-step_indicate_na.R | 1 + tests/testthat/test-step_intercept.R | 1 + tests/testthat/test-step_inverse.R | 1 + tests/testthat/test-step_lag.R | 1 + tests/testthat/test-step_lencode_bayes.R | 1 + tests/testthat/test-step_lencode_glm.R | 1 + tests/testthat/test-step_lencode_mixed.R | 1 + tests/testthat/test-step_log.R | 1 + tests/testthat/test-step_mutate.R | 1 + tests/testthat/test-step_nearmiss.R | 1 + tests/testthat/test-step_normalize.R | 1 + tests/testthat/test-step_novel.R | 1 + tests/testthat/test-step_other.R | 1 + tests/testthat/test-step_pca.R | 1 + tests/testthat/test-step_pca_sparse.R | 1 + tests/testthat/test-step_pca_sparse_bayes.R | 1 + tests/testthat/test-step_pca_truncated.R | 1 + tests/testthat/test-step_range.R | 1 + tests/testthat/test-step_ratio.R | 1 + tests/testthat/test-step_rename.R | 1 + tests/testthat/test-step_rose.R | 1 + tests/testthat/test-step_scale.R | 1 + tests/testthat/test-step_smote.R | 1 + tests/testthat/test-step_smotenc.R | 1 + tests/testthat/test-step_sqrt.R | 1 + tests/testthat/test-step_tomek.R | 1 + tests/testthat/test-step_unknown.R | 1 + tests/testthat/test-step_upsample.R | 1 + 41 files changed, 47 insertions(+), 6 deletions(-) diff --git a/tests/testthat/test-augment.R b/tests/testthat/test-augment.R index e74f889..d4f17eb 100644 --- a/tests/testthat/test-augment.R +++ b/tests/testthat/test-augment.R @@ -38,6 +38,7 @@ test_that("SQLite - augment() works", { skip_if_not_installed("workflows") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-model-partykit.R b/tests/testthat/test-model-partykit.R index 8c43c05..917d075 100644 --- a/tests/testthat/test-model-partykit.R +++ b/tests/testthat/test-model-partykit.R @@ -1,8 +1,8 @@ test_that("decision_tree(partykit) works with type = class", { skip_if_not_installed("parsnip") skip_if_not_installed("tidypredict") - skip_if_not_installed("bonsai") - library(bonsai) + skip_if_not_installed("bonsai") + library(bonsai) mtcars$vs <- factor(mtcars$vs) @@ -27,8 +27,8 @@ test_that("decision_tree(partykit) works with type = class", { test_that("decision_tree(partykit) works with type = prob", { skip_if_not_installed("parsnip") skip_if_not_installed("tidypredict") - skip_if_not_installed("bonsai") - library(bonsai) + skip_if_not_installed("bonsai") + library(bonsai) mtcars$vs <- factor(mtcars$vs) @@ -59,8 +59,8 @@ test_that("decision_tree(partykit) works with type = prob", { test_that("decision_tree(partykit) works with type = c(class, prob)", { skip_if_not_installed("parsnip") skip_if_not_installed("tidypredict") - skip_if_not_installed("bonsai") - library(bonsai) + skip_if_not_installed("bonsai") + library(bonsai) mtcars$vs <- factor(mtcars$vs) diff --git a/tests/testthat/test-step_adasyn.R b/tests/testthat/test-step_adasyn.R index 91c74a8..d7ea816 100644 --- a/tests/testthat/test-step_adasyn.R +++ b/tests/testthat/test-step_adasyn.R @@ -80,6 +80,7 @@ test_that("SQLite - step_adasyn works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_adasyn <- dplyr::as_tibble(mtcars) mtcars_adasyn$vs <- as.factor(mtcars$vs) @@ -107,6 +108,7 @@ test_that("duckdb - step_adasyn works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_adasyn <- dplyr::as_tibble(mtcars) mtcars_adasyn$vs <- as.factor(mtcars$vs) diff --git a/tests/testthat/test-step_bin2factor.R b/tests/testthat/test-step_bin2factor.R index d957aa8..b8cf426 100644 --- a/tests/testthat/test-step_bin2factor.R +++ b/tests/testthat/test-step_bin2factor.R @@ -76,6 +76,7 @@ test_that("SQLite - step_bin2factor works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_boxcox.R b/tests/testthat/test-step_boxcox.R index 785e2c7..09f2fb1 100644 --- a/tests/testthat/test-step_boxcox.R +++ b/tests/testthat/test-step_boxcox.R @@ -74,6 +74,7 @@ test_that("SQLite - step_BoxCox works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_bsmote.R b/tests/testthat/test-step_bsmote.R index 70b4c38..f614e86 100644 --- a/tests/testthat/test-step_bsmote.R +++ b/tests/testthat/test-step_bsmote.R @@ -80,6 +80,7 @@ test_that("SQLite - step_bsmote works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_bsmote <- dplyr::as_tibble(mtcars) mtcars_bsmote$vs <- as.factor(mtcars$vs) diff --git a/tests/testthat/test-step_center.R b/tests/testthat/test-step_center.R index 2f0b4b0..618245f 100644 --- a/tests/testthat/test-step_center.R +++ b/tests/testthat/test-step_center.R @@ -74,6 +74,7 @@ test_that("SQLite - step_center works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_discretize.R b/tests/testthat/test-step_discretize.R index a25da86..dfb2b5c 100644 --- a/tests/testthat/test-step_discretize.R +++ b/tests/testthat/test-step_discretize.R @@ -125,6 +125,7 @@ test_that("SQLite - step_discretize works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_discretize <- dplyr::as_tibble(mtcars) mtcars_discretize[1, ] <- NA diff --git a/tests/testthat/test-step_downsample.R b/tests/testthat/test-step_downsample.R index 32c6d51..03b0db4 100644 --- a/tests/testthat/test-step_downsample.R +++ b/tests/testthat/test-step_downsample.R @@ -80,6 +80,7 @@ test_that("SQLite - step_downsample works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_downsample <- dplyr::as_tibble(mtcars) mtcars_downsample$vs <- as.factor(mtcars$vs) diff --git a/tests/testthat/test-step_dummy.R b/tests/testthat/test-step_dummy.R index 6730c20..4abe9f3 100644 --- a/tests/testthat/test-step_dummy.R +++ b/tests/testthat/test-step_dummy.R @@ -105,6 +105,7 @@ test_that("SQLite - step_dummy works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars1 <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_impute_mean.R b/tests/testthat/test-step_impute_mean.R index 415fc08..2d9ddd6 100644 --- a/tests/testthat/test-step_impute_mean.R +++ b/tests/testthat/test-step_impute_mean.R @@ -77,6 +77,7 @@ test_that("SQLite - step_impute_mean works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_impute_mean <- dplyr::as_tibble(mtcars) mtcars_impute_mean[2:4, ] <- NA diff --git a/tests/testthat/test-step_impute_median.R b/tests/testthat/test-step_impute_median.R index b51259c..f4b107a 100644 --- a/tests/testthat/test-step_impute_median.R +++ b/tests/testthat/test-step_impute_median.R @@ -78,6 +78,7 @@ test_that("SQLite - step_impute_median works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_impute_median <- dplyr::as_tibble(mtcars) mtcars_impute_median[2:4, ] <- NA diff --git a/tests/testthat/test-step_impute_mode.R b/tests/testthat/test-step_impute_mode.R index 928b644..f19c2a7 100644 --- a/tests/testthat/test-step_impute_mode.R +++ b/tests/testthat/test-step_impute_mode.R @@ -86,6 +86,7 @@ test_that("SQLite - step_impute_mode works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_impute_mode <- dplyr::as_tibble(mtcars) mtcars_impute_mode$gear <- letters[mtcars$gear] diff --git a/tests/testthat/test-step_indicate_na.R b/tests/testthat/test-step_indicate_na.R index 52d652c..f6ee162 100644 --- a/tests/testthat/test-step_indicate_na.R +++ b/tests/testthat/test-step_indicate_na.R @@ -80,6 +80,7 @@ test_that("SQLite - step_indicate_na works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_indicate_na <- dplyr::as_tibble(mtcars) mtcars_indicate_na[2:4, ] <- NA diff --git a/tests/testthat/test-step_intercept.R b/tests/testthat/test-step_intercept.R index d3741e8..d0d280b 100644 --- a/tests/testthat/test-step_intercept.R +++ b/tests/testthat/test-step_intercept.R @@ -64,6 +64,7 @@ test_that("SQLite - step_intercept works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_inverse.R b/tests/testthat/test-step_inverse.R index da12aa3..2f584cf 100644 --- a/tests/testthat/test-step_inverse.R +++ b/tests/testthat/test-step_inverse.R @@ -91,6 +91,7 @@ test_that("SQLite - step_inverse works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_lag.R b/tests/testthat/test-step_lag.R index b287afe..5bce63f 100644 --- a/tests/testthat/test-step_lag.R +++ b/tests/testthat/test-step_lag.R @@ -60,6 +60,7 @@ test_that("SQLite - step_lag works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_lencode_bayes.R b/tests/testthat/test-step_lencode_bayes.R index 05a2c69..0109338 100644 --- a/tests/testthat/test-step_lencode_bayes.R +++ b/tests/testthat/test-step_lencode_bayes.R @@ -98,6 +98,7 @@ test_that("SQLite - step_lencode_bayes works", { skip_if_not_installed("rstanarm") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_lencode_bayes <- dplyr::as_tibble(mtcars) mtcars_lencode_bayes$gear <- as.factor(mtcars_lencode_bayes$gear) diff --git a/tests/testthat/test-step_lencode_glm.R b/tests/testthat/test-step_lencode_glm.R index 5adf26b..dfd539f 100644 --- a/tests/testthat/test-step_lencode_glm.R +++ b/tests/testthat/test-step_lencode_glm.R @@ -93,6 +93,7 @@ test_that("SQLite - step_lencode_glm works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_lencode_glm <- dplyr::as_tibble(mtcars) mtcars_lencode_glm$gear <- as.factor(mtcars_lencode_glm$gear) diff --git a/tests/testthat/test-step_lencode_mixed.R b/tests/testthat/test-step_lencode_mixed.R index f828f60..f3bf3c9 100644 --- a/tests/testthat/test-step_lencode_mixed.R +++ b/tests/testthat/test-step_lencode_mixed.R @@ -93,6 +93,7 @@ test_that("SQLite - step_lencode_mixed works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_lencode_mixed <- dplyr::as_tibble(mtcars) mtcars_lencode_mixed$gear <- as.factor(mtcars_lencode_mixed$gear) diff --git a/tests/testthat/test-step_log.R b/tests/testthat/test-step_log.R index 2ade680..1316f36 100644 --- a/tests/testthat/test-step_log.R +++ b/tests/testthat/test-step_log.R @@ -91,6 +91,7 @@ test_that("SQLite - step_log works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_mutate.R b/tests/testthat/test-step_mutate.R index feeacbf..5f65d25 100644 --- a/tests/testthat/test-step_mutate.R +++ b/tests/testthat/test-step_mutate.R @@ -74,6 +74,7 @@ test_that("SQLite - step_mutate works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_nearmiss.R b/tests/testthat/test-step_nearmiss.R index 6f41a46..2c4bb64 100644 --- a/tests/testthat/test-step_nearmiss.R +++ b/tests/testthat/test-step_nearmiss.R @@ -80,6 +80,7 @@ test_that("SQLite - step_nearmiss works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_nearmiss <- dplyr::as_tibble(mtcars) mtcars_nearmiss$vs <- as.factor(mtcars$vs) diff --git a/tests/testthat/test-step_normalize.R b/tests/testthat/test-step_normalize.R index 41b00b1..0c66e8d 100644 --- a/tests/testthat/test-step_normalize.R +++ b/tests/testthat/test-step_normalize.R @@ -74,6 +74,7 @@ test_that("SQLite - step_normalize works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_novel.R b/tests/testthat/test-step_novel.R index c1a6f5c..c1c482d 100644 --- a/tests/testthat/test-step_novel.R +++ b/tests/testthat/test-step_novel.R @@ -96,6 +96,7 @@ test_that("SQLite - step_novel works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_novel <- dplyr::as_tibble(mtcars) mtcars_novel$gear <- letters[mtcars$gear] diff --git a/tests/testthat/test-step_other.R b/tests/testthat/test-step_other.R index 3530275..6fc4b05 100644 --- a/tests/testthat/test-step_other.R +++ b/tests/testthat/test-step_other.R @@ -98,6 +98,7 @@ test_that("SQLite - step_other works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_other <- dplyr::as_tibble(mtcars) mtcars_other$gear <- letters[mtcars$gear] diff --git a/tests/testthat/test-step_pca.R b/tests/testthat/test-step_pca.R index b203ce8..32a88f1 100644 --- a/tests/testthat/test-step_pca.R +++ b/tests/testthat/test-step_pca.R @@ -95,6 +95,7 @@ test_that("SQLite - step_pca works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars0 <- dplyr::as_tibble(mtcars) mtcars0$hp <- NULL diff --git a/tests/testthat/test-step_pca_sparse.R b/tests/testthat/test-step_pca_sparse.R index e80945a..a901bc9 100644 --- a/tests/testthat/test-step_pca_sparse.R +++ b/tests/testthat/test-step_pca_sparse.R @@ -110,6 +110,7 @@ test_that("SQLite - step_pca_sparse works", { skip_if_not_installed("embed") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars0 <- dplyr::as_tibble(mtcars) mtcars0$hp <- NULL diff --git a/tests/testthat/test-step_pca_sparse_bayes.R b/tests/testthat/test-step_pca_sparse_bayes.R index c214078..b02cbd8 100644 --- a/tests/testthat/test-step_pca_sparse_bayes.R +++ b/tests/testthat/test-step_pca_sparse_bayes.R @@ -115,6 +115,7 @@ test_that("SQLite - step_pca_sparse_bayes works", { skip_if_not_installed("VBsparsePCA") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars0 <- dplyr::as_tibble(mtcars) mtcars0$hp <- NULL diff --git a/tests/testthat/test-step_pca_truncated.R b/tests/testthat/test-step_pca_truncated.R index 3cbc7b4..2381e8c 100644 --- a/tests/testthat/test-step_pca_truncated.R +++ b/tests/testthat/test-step_pca_truncated.R @@ -108,6 +108,7 @@ test_that("SQLite - step_pca_truncated works", { skip_if_not_installed("embed") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars0 <- dplyr::as_tibble(mtcars) mtcars0$hp <- NULL diff --git a/tests/testthat/test-step_range.R b/tests/testthat/test-step_range.R index ae7781b..1cd1e4c 100644 --- a/tests/testthat/test-step_range.R +++ b/tests/testthat/test-step_range.R @@ -91,6 +91,7 @@ test_that("SQLite - step_range works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_ratio.R b/tests/testthat/test-step_ratio.R index 2fa5daa..ddb09ca 100644 --- a/tests/testthat/test-step_ratio.R +++ b/tests/testthat/test-step_ratio.R @@ -85,6 +85,7 @@ test_that("SQLite - step_ratio works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_rename.R b/tests/testthat/test-step_rename.R index 69ff7d6..207af3b 100644 --- a/tests/testthat/test-step_rename.R +++ b/tests/testthat/test-step_rename.R @@ -74,6 +74,7 @@ test_that("SQLite - step_rename works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_rose.R b/tests/testthat/test-step_rose.R index ed6d4cc..ba66a92 100644 --- a/tests/testthat/test-step_rose.R +++ b/tests/testthat/test-step_rose.R @@ -80,6 +80,7 @@ test_that("SQLite - step_rose works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_rose <- dplyr::as_tibble(mtcars) mtcars_rose$vs <- as.factor(mtcars$vs) diff --git a/tests/testthat/test-step_scale.R b/tests/testthat/test-step_scale.R index abcaeb6..79ac1b6 100644 --- a/tests/testthat/test-step_scale.R +++ b/tests/testthat/test-step_scale.R @@ -74,6 +74,7 @@ test_that("SQLite - step_scale works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_smote.R b/tests/testthat/test-step_smote.R index 8516d97..e028e18 100644 --- a/tests/testthat/test-step_smote.R +++ b/tests/testthat/test-step_smote.R @@ -80,6 +80,7 @@ test_that("SQLite - step_smote works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_smote <- dplyr::as_tibble(mtcars) mtcars_smote$vs <- as.factor(mtcars$vs) diff --git a/tests/testthat/test-step_smotenc.R b/tests/testthat/test-step_smotenc.R index 1bee2b5..139676b 100644 --- a/tests/testthat/test-step_smotenc.R +++ b/tests/testthat/test-step_smotenc.R @@ -80,6 +80,7 @@ test_that("SQLite - step_smotenc works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_smotenc <- dplyr::as_tibble(mtcars) mtcars_smotenc$vs <- as.factor(mtcars$vs) diff --git a/tests/testthat/test-step_sqrt.R b/tests/testthat/test-step_sqrt.R index 5cf479a..71e9eaa 100644 --- a/tests/testthat/test-step_sqrt.R +++ b/tests/testthat/test-step_sqrt.R @@ -74,6 +74,7 @@ test_that("SQLite - step_sqrt works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars <- dplyr::as_tibble(mtcars) diff --git a/tests/testthat/test-step_tomek.R b/tests/testthat/test-step_tomek.R index 63f309a..8f81758 100644 --- a/tests/testthat/test-step_tomek.R +++ b/tests/testthat/test-step_tomek.R @@ -80,6 +80,7 @@ test_that("SQLite - step_tomek works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_tomek <- dplyr::as_tibble(mtcars) mtcars_tomek$vs <- as.factor(mtcars$vs) diff --git a/tests/testthat/test-step_unknown.R b/tests/testthat/test-step_unknown.R index 0a38d16..708cbfc 100644 --- a/tests/testthat/test-step_unknown.R +++ b/tests/testthat/test-step_unknown.R @@ -90,6 +90,7 @@ test_that("SQLite - step_unknown works", { skip_if_not_installed("recipes") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_unknown <- dplyr::as_tibble(mtcars) mtcars_unknown$gear <- letters[mtcars$gear] diff --git a/tests/testthat/test-step_upsample.R b/tests/testthat/test-step_upsample.R index 2930b06..30912d3 100644 --- a/tests/testthat/test-step_upsample.R +++ b/tests/testthat/test-step_upsample.R @@ -80,6 +80,7 @@ test_that("SQLite - step_upsample works", { skip_if_not_installed("themis") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") + skip_on_cran() mtcars_upsample <- dplyr::as_tibble(mtcars) mtcars_upsample$vs <- as.factor(mtcars$vs) From 58f26a4c61c3065907db71cfe3c41f5f05cb964a Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt <emilhhvitfeldt@gmail.com> Date: Sat, 21 Dec 2024 16:09:15 -0800 Subject: [PATCH 6/7] add mising skip_if_not_installed("lme4") --- tests/testthat/test-step_lencode_mixed.R | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/testthat/test-step_lencode_mixed.R b/tests/testthat/test-step_lencode_mixed.R index f3bf3c9..6cfda80 100644 --- a/tests/testthat/test-step_lencode_mixed.R +++ b/tests/testthat/test-step_lencode_mixed.R @@ -1,6 +1,7 @@ test_that("step_lencode_mixed works", { skip_if_not_installed("recipes") skip_if_not_installed("embed") + skip_if_not_installed("lme4") mtcars <- dplyr::as_tibble(mtcars) mtcars$gear <- as.factor(mtcars$gear) @@ -23,6 +24,7 @@ test_that("step_lencode_mixed works", { test_that("step_lencode_mixed only calculates what is sufficient", { skip_if_not_installed("recipes") skip_if_not_installed("embed") + skip_if_not_installed("lme4") mtcars <- dplyr::as_tibble(mtcars) mtcars$gear <- as.factor(mtcars$gear) @@ -44,6 +46,7 @@ test_that("step_lencode_mixed only calculates what is sufficient", { test_that("step_lencode_mixed works with empty selections", { skip_if_not_installed("recipes") skip_if_not_installed("embed") + skip_if_not_installed("lme4") mtcars <- dplyr::as_tibble(mtcars) mtcars$gear <- as.factor(mtcars$gear) @@ -65,7 +68,10 @@ test_that("step_lencode_mixed works with empty selections", { test_that("spark - step_lencode_mixed works", { skip_if_not_installed("recipes") + skip_if_not_installed("embed") + skip_if_not_installed("lme4") skip_if_not_installed("sparklyr") + skip_if(is.na(testthat_spark_env_version())) mtcars_lencode_mixed <- dplyr::as_tibble(mtcars) @@ -91,6 +97,8 @@ test_that("spark - step_lencode_mixed works", { test_that("SQLite - step_lencode_mixed works", { skip_if_not_installed("recipes") + skip_if_not_installed("embed") + skip_if_not_installed("lme4") skip_if_not_installed("DBI") skip_if_not_installed("RSQLite") skip_on_cran() @@ -120,6 +128,8 @@ test_that("SQLite - step_lencode_mixed works", { test_that("duckdb - step_lencode_mixed works", { skip_if_not_installed("recipes") + skip_if_not_installed("embed") + skip_if_not_installed("lme4") skip_if_not_installed("DBI") skip_if_not_installed("duckdb") @@ -148,6 +158,8 @@ test_that("duckdb - step_lencode_mixed works", { test_that("arrow - step_lencode_mixed works", { skip_if_not_installed("recipes") + skip_if_not_installed("embed") + skip_if_not_installed("lme4") skip_if_not_installed("arrow") mtcars_lencode_mixed <- dplyr::as_tibble(mtcars) From 4095b4165a7a0ab1ecf39fff2063d78c186cb6a1 Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt <emilhhvitfeldt@gmail.com> Date: Sat, 21 Dec 2024 23:04:49 -0800 Subject: [PATCH 7/7] Increment version number to 0.3.0.9000 --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 925b243..da9e155 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: orbital Title: Predict with 'tidymodels' Workflows in Databases -Version: 0.3.0 +Version: 0.3.0.9000 Authors@R: c( person("Emil", "Hvitfeldt", , "emil.hvitfeldt@posit.co", role = c("aut", "cre")), person("Posit Software, PBC", role = c("cph", "fnd")) diff --git a/NEWS.md b/NEWS.md index 4aa0bed..1b22444 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# orbital (development version) + # orbital 0.3.0 * `orbital()` has gained `type` argument to change prediction type. (#66)