Bearloga has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/314458

Change subject: Ungroup grouped data frames
......................................................................

Ungroup grouped data frames

Fixes a bug in which we'll run into problems rbind-ing
a grouped data frame with an ungrouped data frame in
rewrite_conditional.

Bug: T146422
Change-Id: I9906c65c46fe06b38fbf1f36e190d4d51c5311bc
---
M DESCRIPTION
M NEWS.md
M R/writers.R
3 files changed, 10 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wmf 
refs/changes/58/314458/1

diff --git a/DESCRIPTION b/DESCRIPTION
index eca1a54..af9d88f 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: wmf
 Type: Package
 Title: R Code for Wikimedia Foundation Internal Usage
-Version: 0.2.3
-Date: 2016-09-19
+Version: 0.2.4
+Date: 2016-10-05
 Authors@R: c(
   person("Oliver", "Keyes", email = "oli...@wikimedia.org", role = "cre"),
   person("Mikhail", "Popov", email = "mpo...@wikimedia.org", role = "aut"))
diff --git a/NEWS.md b/NEWS.md
index ec4646a..7fa9a6f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,10 @@
+wmf 0.2.4
+============
+* Ungroups grouped data frames when rewriting. See 
[T146422](https://phabricator.wikimedia.org/T146422) for more details.
+
 wmf 0.2.3
 =============
-Fixes ggplot2 theme margin bug [discovered & 
fixed](https://github.com/wikimedia/wikimedia-discovery-wmf/pull/1) by Oliver 
Keyes.
+* Fixes ggplot2 theme margin bug [discovered & 
fixed](https://github.com/wikimedia/wikimedia-discovery-wmf/pull/1) by Oliver 
Keyes.
 
 wmf 0.2.2
 =============
diff --git a/R/writers.R b/R/writers.R
index cc77037..e6f465e 100644
--- a/R/writers.R
+++ b/R/writers.R
@@ -27,6 +27,9 @@
 #'@importFrom readr read_tsv
 #'@export
 rewrite_conditional <- function(x, file, n_days = 30) {
+  if ("grouped_df" %in% class(x)) {
+    x <- dplyr::ungroup(x)
+  }
   if (file.exists(file)) {
     y <- readr::read_tsv(file)
     y <- y[order(y$date, decreasing = FALSE), ]

-- 
To view, visit https://gerrit.wikimedia.org/r/314458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9906c65c46fe06b38fbf1f36e190d4d51c5311bc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wmf
Gerrit-Branch: master
Gerrit-Owner: Bearloga <mpo...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to