Skip to content

Commit

Permalink
snap updates (#156)
Browse files Browse the repository at this point in the history
* snap updates

* Update PULL_REQUEST_TEMPLATE.md
  • Loading branch information
ddsjoberg committed Jun 21, 2023
1 parent b44ec63 commit ba80c00
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

--------------------------------------------------------------------------------

Reviewer Checklist (if item does not apply, mark is as complete)
Reviewer Checklist (if item does not apply, mark as complete)

- [ ] Ensure all package dependencies are installed by running `renv::install()`
- [ ] PR branch has pulled the most recent updates from master branch. Ensure the pull request branch and your local version match and both have the latest updates from the master branch.
Expand Down
4 changes: 2 additions & 2 deletions man/ggsurvfit-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/survfit2.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 25 additions & 25 deletions tests/testthat/_snaps/ggcuminc/cuminc3-ggcuminc-sf-all-outcomes.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions tests/testthat/test-add_censor_mark.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ test_that("add_censor_mark() works with ggsurvfit()", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("sf1-censor_mark", lst_survfit2_censor_mark[[1]])
vdiffr::expect_doppelganger("sf2-censor_mark", lst_survfit2_censor_mark[[2]])
Expand Down Expand Up @@ -44,8 +44,8 @@ test_that("add_censor_mark() works with ggcuminc()", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("cuminc1-censor_mark", lst_cuminc_censor_mark[[1]])
vdiffr::expect_doppelganger("cuminc2-censor_mark", lst_cuminc_censor_mark[[2]])
Expand All @@ -60,8 +60,8 @@ test_that("add_censor_mark() works with ggcuminc()", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("cuminc1-censor_mark-all-outcomes", lst_cuminc_censor_mark_outcome[[1]])
vdiffr::expect_doppelganger("cuminc2-censor_mark-all-outcomes", lst_cuminc_censor_mark_outcome[[2]])
Expand Down
4 changes: 2 additions & 2 deletions tests/testthat/test-add_confidence_interval.R
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ test_that("add_confidence_interval() works with ggcuminc() and multiple outcomes
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("cuminc1-confidence_interval-all-outcomes",
lst_cuminc_confidence_interval_outcomes[[1]])
Expand Down
12 changes: 6 additions & 6 deletions tests/testthat/test-add_quantile.R
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ test_that("add_quantile() works with ggsurvfit()", {
)


skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("sf1-quantile", lst_survfit2_quantile[[1]])
vdiffr::expect_doppelganger("sf2-quantile", lst_survfit2_quantile[[2]])
Expand Down Expand Up @@ -151,8 +151,8 @@ test_that("add_quantile() works with ggcuminc()", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("cuminc1-quantile", lst_cuminc_quantile[[1]])
vdiffr::expect_doppelganger("cuminc2-quantile", lst_cuminc_quantile[[2]])
Expand All @@ -167,8 +167,8 @@ test_that("add_quantile() works with ggcuminc() and multiple outcomes", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("cuminc1-quantile-all-outcomes", lst_cuminc_quantile_outcomes[[1]])
vdiffr::expect_doppelganger("cuminc2-quantile-all-outcomes", lst_cuminc_quantile_outcomes[[2]])
Expand Down
16 changes: 8 additions & 8 deletions tests/testthat/test-add_risktable.R
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ test_that("add_risktable() works with ggsurvfit()", {
)


skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("sf1-risktable", lst_survfit2_risktable[[1]])
vdiffr::expect_doppelganger("sf2-risktable", lst_survfit2_risktable[[2]])
Expand Down Expand Up @@ -164,8 +164,8 @@ test_that("add_risktable() works with ggcuminc()", {
)


skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("cuminc1-risktable", lst_cuminc_risktable[[1]])
vdiffr::expect_doppelganger("cuminc2-risktable", lst_cuminc_risktable[[2]])
Expand All @@ -180,8 +180,8 @@ test_that("add_risktable() works with ggcuminc() and multiple outcomes", {
NA,
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("cuminc1-risktable-all-outcomes", lst_cuminc_risktable_outcomes[[1]])
vdiffr::expect_doppelganger("cuminc2-risktable-all-outcomes", lst_cuminc_risktable_outcomes[[2]])
Expand Down Expand Up @@ -244,8 +244,8 @@ test_that("add_risktable() custom stats", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("sf1-risktable-custom-stats-and-label", lst_custom_stats[[1]])
vdiffr::expect_doppelganger("sf2-risktable-custom-stats-and-label", lst_custom_stats[[2]])
Expand Down
4 changes: 2 additions & 2 deletions tests/testthat/test-ggcuminc.R
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ test_that("ggcuminc() works with multiple outcomes", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("cuminc1-ggcuminc-all-outcomes", lst_ggcuminc_outcomes[[1]])
vdiffr::expect_doppelganger("cuminc2-ggcuminc-all-outcomes", lst_ggcuminc_outcomes[[2]])
Expand Down
4 changes: 2 additions & 2 deletions tests/testthat/test-ggsurvfit.R
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ test_that("ggsurvfit() works with geoms with new data", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("sf2-ggsurvfit_new_data_geom1", p1)
vdiffr::expect_doppelganger("sf2-ggsurvfit_new_data_geom2", p2)
Expand Down
4 changes: 2 additions & 2 deletions tests/testthat/test-stat_stepribbon.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ test_that("stat_stepribbon() works", {
NA
)

skip_on_os("linux")
skip_on_os("mac")
# only check on mac
skip_on_os(c("linux", "windows", "solaris"))
skip_if_not(identical(current_release_version, loaded_release_version))
vdiffr::expect_doppelganger("gg_stepribbon1", gg_stepribbon1)
vdiffr::expect_doppelganger("gg_stepribbon2", gg_stepribbon2)
Expand Down

0 comments on commit ba80c00

Please sign in to comment.