import "!!" from rlang and n from dplyr.

grunwaldlab · Sep 2, 2017 · b2d0624 · b2d0624
1 parent 1cbc2aa
commit b2d0624
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -45,6 +45,7 @@ Imports:
     pegas,
     reshape2,
     dplyr (>= 0.4),
+    rlang,
     boot,
     shiny,
     magrittr

diff --git a/NAMESPACE b/NAMESPACE
@@ -129,6 +129,7 @@ importFrom(boot,norm.ci)
 importFrom(dplyr,"%>%")
 importFrom(dplyr,arrange_)
 importFrom(dplyr,group_by_)
+importFrom(dplyr,n)
 importFrom(dplyr,progress_estimated)
 importFrom(dplyr,ungroup)
 importFrom(grDevices,as.raster)
@@ -166,6 +167,7 @@ importFrom(pegas,loci2genind)
 importFrom(phangorn,midpoint)
 importFrom(phangorn,upgma)
 importFrom(reshape2,melt)
+importFrom(rlang,"!!")
 importFrom(stats,as.dist)
 importFrom(stats,as.formula)
 importFrom(stats,dbinom)

diff --git a/NEWS b/NEWS
@@ -27,6 +27,12 @@ MISC
 * The internal plotting function for mlg.table now uses tidy evaluation for
   dplyr versions > 0.5.0. 
 
+NEW IMPORTS
+-----------
+
+* Due to the migration to dplyr version 0.7.0, poppr now imports the "!!"
+  operator from the rlang package. 
+
 poppr 2.4.1
 ===========
 

diff --git a/R/internal.r b/R/internal.r
@@ -1727,7 +1727,8 @@ test_zeroes <- function(x){
 #'
 #' @importFrom dplyr %>% 
 #' @importFrom dplyr arrange_ group_by_ ungroup
-#' @importFrom dplyr `!!`
+#' @importFrom dplyr n
+#' @importFrom rlang "!!"
 mlg_barplot <- function(mlgt, color = FALSE, background = FALSE){
   names(dimnames(mlgt)) <- c("Population", "MLG")
   mlgt.df <- reshape2::melt(mlgt, value.name = "count")
@@ -1789,7 +1790,7 @@ mlg_barplot <- function(mlgt, color = FALSE, background = FALSE){
       dplyr::ungroup() %>%
       unique() %>%
       dplyr::filter(!!quote(count > 0)) %>%
-      dplyr::mutate(order = seq(dplyr::n())) %>%
+      dplyr::mutate(order = seq(n())) %>%
       dplyr::mutate(order = factor(!!quote(order), unique(!!quote(order))))
   }