From fcda72ae988686a52dea9f3bf8e7feec50391dab Mon Sep 17 00:00:00 2001 From: pat-s Date: Thu, 21 Jun 2018 11:16:41 +0200 Subject: [PATCH 1/8] delete revdep checks --- revdep/checks.rds | Bin 590 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 revdep/checks.rds diff --git a/revdep/checks.rds b/revdep/checks.rds deleted file mode 100644 index 071097fe5f09a7bf6a1486c9c8079004bf31bc1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmV-U0v4gp4KhqP)tO*`ZW)8g7D1a|8tb;lmsRoV@C ziD3~Tj%=r_J?&rbR^}vjAnv3d;`n{<^Lx)P@5_%<$8lVz+f!?|+`d(dGMp#J>6ZI} zdfup~qtKyxf4K4PDHjRLyeS9(^u`#Xxeo&$qlv|R_j?g8!{Cz_6TV9_6oL>yi*tT+ zD~mW`-WUM{a4@%n^u|}$Hg-m{<=ri~`~J;eSgz4k!C6i(zEYkhndLmKYYlxkSApFl zPd_7DDl~nd!GXT1HeZPcA?a3IZjtESNlLPHLDtk9i&&ZxX-ro>nybVmY9)?RB7}X3 zT%BJrzFj8SiXDB8z9tS2sdjnFq%qg)(!!?TwIn}NQ%8T3C6a4n$l_RVA`@m>nv-aw z?hvy`7!KbOzKPlH(13`f)VNP16;l2p(yGaM;obT8BC#E?55Zi`jW#gA03AHI@$}RH zg~ovZJRE`LplYLw!0Z@D$0x9rxty2KN6^QMHiG>rY#|W)I6Oksl+Ap!Xd~6!wc;Qp zoHi$D$Ei7=+qo2HYE?RlILW;6W!0*Q1y(Jy!K!rze67K8S8-}lR=-QfD&DDmEv#n>=kz|Nd7~jCbn_jQ ck7hB=qNLH8IwFcxmW4n41FGB#qOS!20O4OA@Bjb+ From a421e622d76cc86ee0443b8422db358991c2e22d Mon Sep 17 00:00:00 2001 From: pat-s Date: Thu, 21 Jun 2018 11:18:12 +0200 Subject: [PATCH 2/8] spelling --- R/or_glm.R | 2 +- man/or_glm.Rd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/or_glm.R b/R/or_glm.R index e85d203..6403aa4 100644 --- a/R/or_glm.R +++ b/R/or_glm.R @@ -24,7 +24,7 @@ #' #' @details `CI_low` and `CI_high` are only calculated for GLM models because #' [glmmPQL] does not return confident intervals due to its penalizing -#' behaviour. +#' behavior. #' #' @author Patrick Schratz #' diff --git a/man/or_glm.Rd b/man/or_glm.Rd index b0fdb1c..9ea95e6 100644 --- a/man/or_glm.Rd +++ b/man/or_glm.Rd @@ -31,7 +31,7 @@ increment steps of GLMs. \details{ \code{CI_low} and \code{CI_high} are only calculated for GLM models because \link{glmmPQL} does not return confident intervals due to its penalizing -behaviour. +behavior. Currently supported functions: \link{glm}, \link{glmmPQL} From ef51372ee861acf291cdfbb91f994c3b6e4806d6 Mon Sep 17 00:00:00 2001 From: pat-s Date: Wed, 4 Jul 2018 20:53:54 +0200 Subject: [PATCH 3/8] add ggplot2 > 3.0.0 dependency --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 98eb5aa..e327566 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: oddsratio Version: 1.0.3 -Date: 2018-06-19 +Date: 2018-07-04 Title: Odds ratio calculation for GAM(M)s & GLM(M)s Authors@R: c( person("Patrick", "Schratz", , @@ -21,7 +21,7 @@ Depends: R (>= 3.0.0) Imports: mgcv, MASS, stats, - ggplot2 (>= 2.2.1), + ggplot2 (>= 3.0.0), cowplot License: MIT + file LICENSE RoxygenNote: 6.0.1 From 5ff31b18d74a3516afa4e1e6cd54cb6dcec5cb21 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 15 Jul 2018 11:58:15 +0200 Subject: [PATCH 4/8] title case title --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index e327566..c3b7de1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: oddsratio Version: 1.0.3 Date: 2018-07-04 -Title: Odds ratio calculation for GAM(M)s & GLM(M)s +Title: Odds Ratio Calculation for GAM(M)s & GLM(M)s Authors@R: c( person("Patrick", "Schratz", , email = "patrick.schratz@gmail.com", From d6e2f5a8690ea718a9a3a8f7c5a96fc4042acd59 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 15 Jul 2018 11:58:34 +0200 Subject: [PATCH 5/8] update cran comments --- cran-comments.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index f2903cf..1e1e948 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Test environments -* local Arch Linux installation, R 3.5.0 +* local Arch Linux installation, R 3.5.1 * ubuntu 14.04 (on travis-ci), R-devel * OSX 10.12, Xcode 8.3 (on travis-ci), R-devel * win-builder (devel and release) @@ -16,6 +16,3 @@ There are no reverse dependencies. ## Downstream dependencies "There are currently no downstream dependencies for this package” - - -Update for upcoming ggplot2 v2.3.0 release From 63c1fed0ee2d52c8e5f6b5458abd3eec8a6084f9 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 15 Jul 2018 11:58:48 +0200 Subject: [PATCH 6/8] update release date --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c3b7de1..fc6a3a9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: oddsratio Version: 1.0.3 -Date: 2018-07-04 +Date: 2018-07-15 Title: Odds Ratio Calculation for GAM(M)s & GLM(M)s Authors@R: c( person("Patrick", "Schratz", , From 495b70fa0708c77fb5458c919d8f7c8ef70c8e70 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 15 Jul 2018 12:04:48 +0200 Subject: [PATCH 7/8] update NEWS --- NEWS | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 0a65273..9090713 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ oddsratio 1.0.3 (June 19 2018) -------------------------------------------------------------------------------- - * update functions to work with ggplot2 v2.3.0 + * update functions to work with ggplot2 v3.0.0 oddsratio 1.0.2 (December 08 2017) -------------------------------------------------------------------------------- diff --git a/NEWS.md b/NEWS.md index 5ca90c2..cb58965 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # oddsratio 1.0.3 (June 19 2018) -* update functions to work with ggplot2 v2.3.0 +* update functions to work with ggplot2 v3.0.0 # oddsratio 1.0.2 (December 08 2017) From d5792a94482dd3e19045bd597ef48acc5ffd8809 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 12 Aug 2018 21:07:37 +0200 Subject: [PATCH 8/8] remove orphan arg --- tic.R | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tic.R b/tic.R index 40f9666..8141ed4 100644 --- a/tic.R +++ b/tic.R @@ -3,26 +3,26 @@ if (Sys.getenv("NB") != "w/ covr" | Sys.getenv("NB") != "w/ lintr") { } if (Sys.getenv("id_rsa") != "") { - + get_stage("before_deploy") %>% add_step(step_setup_ssh()) - + get_stage("deploy") %>% add_step(step_build_pkgdown()) %>% - add_step(step_push_deploy(orphan = TRUE, path = "docs", branch = "gh-pages")) - -} + add_step(step_push_deploy(path = "docs", branch = "gh-pages")) + +} if (Sys.getenv("NB") == "w/ covr" | Sys.getenv("NB") == "w/ lintr") { - + if (Sys.getenv("NB") == "w/ lintr") { - - get_stage("after_success") %>% - step_run_code(lintr::lint_package(linters = with_defaults(commented_code_linter = NULL, - closed_curly_linter = closed_curly_linter(allow_single_line = TRUE), + + get_stage("after_success") %>% + step_run_code(lintr::lint_package(linters = with_defaults(commented_code_linter = NULL, + closed_curly_linter = closed_curly_linter(allow_single_line = TRUE), open_curly_linter = open_curly_linter(allow_single_line = TRUE)))) } else { - get_stage("after_success") %>% + get_stage("after_success") %>% step_run_code(covr::codecov(quiet = FALSE)) } -} \ No newline at end of file +}