Skip to content

Commit

Permalink
Version Bump, ready for 0.7.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
nutterb committed Apr 17, 2016
1 parent e856a15 commit 2e2fd3a
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 16 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: pixiedust
Title: Tables so Beautifully Fine-Tuned You Will Believe It's Magic
Version: 0.6.4
Version: 0.7.0
Authors@R: person("Benjamin", "Nutter", email = "[email protected]", role = c("aut", "cre"))
Description: The introduction of the broom package has made converting model
objects into data frames as simple as a single function. While the broom
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#### 0.6.4 (15 April 2016)
#### 0.7.0 (15 April 2016)
* Backward compatibility: The way `pixiedust` deals with
colors has changed. If you are using custom defined colors in your
LaTeX preamble, these will no longer work. `pixiedust` will only accept
Expand Down
30 changes: 22 additions & 8 deletions R/dust.R
Original file line number Diff line number Diff line change
Expand Up @@ -197,19 +197,33 @@ dust.default <- function(object, ...,
numeric_level = numeric_level,
argcheck = Check) %>%
dplyr::left_join(tidy_object, .,
by = c("term" = "term")) %>%
dplyr::mutate(
label = ifelse(grepl("([(]|)Intercept([)]|)", term),
term,
label)
)
by = c("term" = "term"))
if ("label" %in% names(tidy_object))
{
tidy_object %<>%
dplyr::mutate(
label = ifelse(grepl("([(]|)Intercept([)]|)", term),
term,
label)
)
}

if ("term_plain" %in% names(tidy_object))
{
tidy_object %<>%
dplyr::mutate(
label = ifelse(grepl("([(]|)Intercept([)]|)", term),
term,
term_plain)
)
}

if (!"term" %in% descriptors)
nms <- nms[!nms %in% "term"]

tidy_object <- dplyr::select_(tidy_object, .dots = c(descriptors, nms))
}

ArgumentCheck::finishArgCheck(Check)

#* Create the table head
Expand Down Expand Up @@ -379,4 +393,4 @@ primaryClass <- function(x){
}


utils::globalVariables(c(".", "term"))
utils::globalVariables(c(".", "term", "term_plain"))
15 changes: 9 additions & 6 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
## Test environments
* local Windows install (devel[2015-01-22 r69985])
* local Windows install (R-3.2.2)
* x86_64-pc-linux-gnu (64-bit) (on travis-ci), R 3.2.2
* local Windows install (R-3.2.4)
* x86_64-pc-linux-gnu (64-bit) (on travis-ci), R 3.2.4
* win-builder (devel and release)

## R CMD check results
Expand All @@ -13,7 +12,11 @@ description. All words are correctly spelled.


## Downstream dependencies
There are no downstream dependencies for this package
at this time.
`HydeNet` fails checks due to errors in the unit tests. This is related
to updates in the `testthat` package. I am the maintainer of `HydeNet`
and am planning to submit an update to `HydeNet` after `dplyr` is updated
later this month.

Many thanks.
`tadaatoolbox` checks return the NOTE "Note: found 1 marked UTF-8 string",
which is also found in its check results on CRAN. `tadaatoolbox` otherwise
passes all checks.

0 comments on commit 2e2fd3a

Please sign in to comment.