Merge branch 'master' of github.com:pat-s/oddsratio

pat-s · Sep 10, 2018 · 59a7fc9 · 59a7fc9
2 parents 30721f3 + d5792a9
commit 59a7fc9
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 23 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: oddsratio
 Version: 1.0.3
-Date: 2018-06-19
-Title: Odds ratio calculation for GAM(M)s & GLM(M)s
+Date: 2018-07-15
+Title: Odds Ratio Calculation for GAM(M)s & GLM(M)s
 Authors@R: c(
    person("Patrick", "Schratz", ,
    email = "[email protected]", 
@@ -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

diff --git 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
@@ -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)
 

diff --git 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 <[email protected]>
 #'

diff --git 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
diff --git a/man/or_glm.Rd b/man/or_glm.Rd
diff --git a/revdep/checks.rds b/revdep/checks.rds
diff --git 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))
   }
-}
+}