Skip to content

Commit 1f43712

Browse files
author
Stefan Fleck
committed
prep for release
1 parent 2219d4a commit 1f43712

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1833
-1339
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Type: Package
22
Package: dint
33
Title: A Toolkit for Year-Quarter, Year-Month and Year-Isoweek
44
Dates
5-
Version: 2.1.0.9003
5+
Version: 2.1.1
66
Authors@R:
77
person(given = "Stefan",
88
family = "Fleck",
@@ -32,7 +32,7 @@ VignetteBuilder:
3232
Encoding: UTF-8
3333
LazyData: true
3434
Roxygen: list(markdown = TRUE)
35-
RoxygenNote: 6.1.1
35+
RoxygenNote: 7.0.1.9000
3636
Collate:
3737
'accessors.R'
3838
'arithmetic.R'

NEWS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# dint 2.1.0.9001
1+
# dint 2.1.1
22

33
* `format.date_xx()` now used `%V` for isoweeks instead of `%W`
44
to prevent confusion with `strftime()`, where `%W` denotes UK-weeks. Using
55
`%W` has been deprecated and will be removed in future versions.
66
* added `yq()`, `qy()`, `ym()`, `my()` "smart" parsers similar to
77
`lubridate::dmy()` & co.
8-
* `as_date_ym()` and `as_date_yw()` now handle input vecotrs that contain `NAs`
8+
* `as_date_ym()` and `as_date_yw()` now handle input vectors that contain `NAs`
99
(as `as_date_yq()` already did)
1010
* `last_of_quarter()` no longer depends on the lubridate package
1111

R/arithmetic.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ range.date_y <- function(..., na.rm = FALSE) {
183183
#' unit of the next year.
184184
#'
185185
#' @param x any `date_xx` object
186-
#' @param digits ignored, only there for compat with [base::round()]
186+
#' @param digits ignored, only there for compatibility with [base::round()]
187187
#'
188188
#' @return a `date_xx` of the same subclass as `x`
189189
#' @export

R/date_xx.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ print.date_xx <- function(
117117
#' @return An Object of the appropriate base \R type (`Date`, `POSIXct`, or
118118
#' `POSIXlt`)
119119
#'
120-
#' @rdname as.Date.date_xx
121120
#' @name as.Date.date_xx
122121
#'
123122
#' @examples
@@ -126,7 +125,7 @@ print.date_xx <- function(
126125
#'
127126
#' # When coercing to datetime, the default timezone is UTC
128127
#' as.POSIXct(date_yq(2017, 2))
129-
#'
128+
NULL
130129

131130

132131

R/format.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#' [ISO8601](https://en.wikipedia.org/wiki/ISO_week_date)
1414
#' }
1515
#' Not all placeholders are supported for all `date_xx` subclasses.
16-
#' Literal \% can be escaped with `"%%"` (as in [base::sprintf()]).
16+
#' Literal `"%"` can be escaped with `"%%"` (as in [base::sprintf()]).
1717
#'
1818
#' @param month_names,month_abb a `character` vector of length 12: Names and
1919
#' abbreviations for months that will be used for the

R/parser.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#' Parse Dates With Year and Quarter Components
22
#'
33
#' These are generic parsers for year/quarter/month formats that work with
4-
#' nearly all possible year/quarter formats. The only prerequisits are that
4+
#' nearly all possible year/quarter formats. The only prerequisite is that
55
#' `x` contains a 4-digit-year and a 1-digit-quarter or 2-digit-month and no
66
#' additional numbers.
77
#'

R/scale_date_xx.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ scale_date_yw <- function(
290290
#' Pretty Breaks For date_xx Vectors
291291
#'
292292
#' `date_*_breaks` does not return breaks, but a function that calculates
293-
#' breaks. This is for compatbility with the breaks functions from \pkg{scales}
293+
#' breaks. This is for compatibility with the breaks functions from \pkg{scales}
294294
#' such as [scales::pretty_breaks()], and for ease of use with \pkg{ggplot2}.
295295
#'
296296
#' @param n `NULL` or `integer` scalar. The desired maximum number of breaks.

R/zoo-compat.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# yearqtr -----------------------------------------------------------------
22

3-
#' Coerce to zoo yeartqr objects
3+
#' Coerce to zoo yearqtr objects
44
#'
55
#' `as_yearqtr()` and `as_yearmon()` are included for interoperability with
66
#' [zoo::yearqtr()], an alternative year-quarter format that is based on a
@@ -55,7 +55,7 @@ as_yearqtr.yearqtr <- function(x){
5555

5656

5757

58-
#' For compat with zoo
58+
#' For Compatibility With zoo
5959
#'
6060
#' Internaly used constructor. If you use zoo, please use [zoo::yearqtr()]
6161
#' instead
@@ -100,7 +100,7 @@ as_yearmon.yearmon <- function(x){
100100

101101

102102

103-
#' For compat with zoo
103+
#' For Compatibility With zoo
104104
#'
105105
#' Internaly used constructor. If you use zoo, please use [zoo::yearmon()]
106106
#' instead
@@ -150,7 +150,7 @@ as_yearweek.yearweek <- function(x){
150150

151151

152152

153-
#' For compat with zoo
153+
#' For Compatibility With zoo
154154
#'
155155
#' Internaly used constructor. If you use zoo, please use [zoo::yearweek()]
156156
#' instead

cran-comments.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
## Test environments
2-
* local ubuntu install, R 3.5.1
3-
* ubuntu 14.04 (via RStudio Server), R 3.4.3
4-
* ubuntu 14.04 (via travis), R 3.5.1
5-
* win-builder (devel and release)
2+
* ubuntu 14.04 (via RStudio Server), R 3.6.1
3+
* ubuntu 16.04 (via travis), R 3.6.1
4+
* win-builder (devel)
5+
* rhub (rhub::check_for_cran())
66

77
## R CMD check results
88

docs/404.html

Lines changed: 141 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)