Skip to content

Commit

Permalink
Merge pull request #33 from moodymudskipper/precran-changes
Browse files Browse the repository at this point in the history
Precran changes
  • Loading branch information
moodymudskipper authored Nov 3, 2022
2 parents 7d4580f + d904836 commit cf7e468
Show file tree
Hide file tree
Showing 21 changed files with 663 additions and 556 deletions.
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 0.0.1
Date: 2022-01-13 00:28:19 UTC
SHA: f48a3c82cd53217a544222827d7b3bb6ff59b27d
Version: 0.1.0
Date: 2022-11-03 05:59:23 UTC
SHA: 7beab93ca2657d3ef31f05d1672a2a310b3c07d8
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: powerjoin
Title: Extensions of 'dplyr' and 'fuzzyjoin' Join Functions
Version: 0.0.1.900
Version: 0.1.0
Authors@R:
c(person(given = "Antoine",
family = "Fabri",
Expand All @@ -27,7 +27,7 @@ Authors@R:
person(given = "RStudio",
role = c("cph", "fnd"),
comment = "cph/fnd dplyr"))
Description: Extensions of 'dplyr' and 'fuzzyjoin' join functions. Packed with
Description: We extend 'dplyr' and 'fuzzyjoin' join functions with
features to preprocess the data, apply various data checks, and deal with
conflicting columns.
License: MIT + file LICENSE
Expand Down
9 changes: 9 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# powerjoin 0.1.0

* The join functions will fail if not provided a `check` argument built with `check_specs()`
* New functions `paste_xy()` and `paste_yx()` to conflict columns by pasting, ignoring NAs and
empty strings by default
* using `rw ~ ...` in the `conflict` argument is better documented
* The class of dates is not lost anymore when using `rw ~ ...` in the `conflict` argument
* Obsolete imports were removed
* Rebuilding the documentation solves the issues that got the package kicked from CRAN
2 changes: 1 addition & 1 deletion R/coalesce.R
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ coalesce_yx <- function(x, y) {
#' @param sep separator
#' @param na How to treat `NAs`, they are ignored by default, if `NA` the result
#' will be `NA`, just as with `stringr::str_c`, if `"NA"` NAs will be coerced
#' to characterm just as with `paste()`. Any other string can be used
#' to character just as with `paste()`. Any other string can be used
#' @param ignore_empty Whether to ignore empty strings, to avoid trailing and leading separators
#'
#' @return A character vector
Expand Down
19 changes: 4 additions & 15 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
## R CMD check results

0 errors | 0 warnings | 1 note
0 errors | 0 warnings | 0 notes

* This is a new release.
## comments

## Answering review from Uwe Ligges 2022-01-12

> Please only ship the CRAN template for the MIT license.
Done.

## Answering review from Julia Haider 2022-01-12

> Please add \value to .Rd files regarding exported methods...
> Please add some more small executable examples...
Added \value and examples to all .Rd
The package was archived on CRAN due to new rules on html, we fixed it by
redocumenting the package using an up to date version of 'roxygen2'
15 changes: 9 additions & 6 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions docs/LICENSE.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cf7e468

Please sign in to comment.