From 3b25fa0a60ad2e81bc254a03e8b7a930750f245a Mon Sep 17 00:00:00 2001 From: "Paul J. McMurdie" Date: Sun, 20 Mar 2016 15:24:46 -0700 Subject: [PATCH] 1.15.3 scales selective import, Issue 577 https://github.com/joey711/phyloseq/issues/577 --- DESCRIPTION | 8 ++++---- NAMESPACE | 2 +- R/plot-methods.R | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3b35e43a..d177b619 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,12 +1,12 @@ Package: phyloseq -Version: 1.15.2 -Date: 2016-01-25 +Version: 1.15.3 +Date: 2016-03-20 Title: Handling and analysis of high-throughput microbiome census data Description: phyloseq provides a set of classes and tools to facilitate the import, storage, analysis, and graphical display of microbiome census data. -Maintainer: Paul J. McMurdie +Maintainer: Paul J. McMurdie Author: Paul J. McMurdie , Susan Holmes , with contributions from Gregory Jordan and Scott Chamberlain @@ -26,7 +26,7 @@ Imports: multtest (>= 2.16.0), plyr (>= 1.8), reshape2 (>= 1.2.2), - scales (>= 0.2.3), + scales (>= 0.3.0), vegan (>= 2.0.10), Biobase Depends: diff --git a/NAMESPACE b/NAMESPACE index 238d6f24..20c3cd72 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -153,7 +153,6 @@ import(foreach) import(ggplot2) import(methods) import(reshape2) -import(scales) importClassesFrom(Biostrings,AAStringSet) importClassesFrom(Biostrings,BStringSet) importClassesFrom(Biostrings,DNAStringSet) @@ -223,6 +222,7 @@ importFrom(plyr,ddply) importFrom(plyr,is.discrete) importFrom(plyr,ldply) importFrom(plyr,llply) +importFrom(scales,log_trans) importFrom(stats,p.adjust) importFrom(stats,p.adjust.methods) importFrom(vegan,betadiver) diff --git a/R/plot-methods.R b/R/plot-methods.R index 9e770653..897832b2 100644 --- a/R/plot-methods.R +++ b/R/plot-methods.R @@ -2107,7 +2107,7 @@ nodeplotdefault = function(size=2L, hjust=-0.2){ #' There are many useful examples of phyloseq tree graphics in the #' \href{http://joey711.github.io/phyloseq/plot_tree-examples}{phyloseq online tutorials}. #' -#' @import scales +#' @importFrom scales log_trans #' @import ggplot2 #' @importFrom data.table setkey #' @importFrom data.table setkeyv @@ -2489,7 +2489,7 @@ RadialTheta <- function(pos){ #' \href{http://joey711.github.io/phyloseq/plot_heatmap-examples}{phyloseq online tutorials}. #' #' @importFrom vegan scores -#' @import scales +#' @importFrom scales log_trans #' #' @export #' @examples