Skip to content

Commit d25d94b

Browse files
committed
Correct argument versionCheck the requireNamespace for the cubble package in st_as_sftime.cubble_df().
1 parent 003bf1b commit d25d94b

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ LICENSE
2323
^\.github$
2424
^revdep$
2525
^Meta$
26+
^CRAN-SUBMISSION$

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ License: Apache License
4646
Type: Package
4747
Encoding: UTF-8
4848
VignetteBuilder: knitr
49-
RoxygenNote: 7.2.3
49+
RoxygenNote: 7.3.2
5050
URL: https://r-spatial.github.io/sftime/, https://github.com/r-spatial/sftime
5151
BugReports: https://github.com/r-spatial/sftime/issues/
5252
Collate:

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# sftime (development version)
22

3+
* Correct argument `versionCheck` the `requireNamespace` for the `cubble` package in `st_as_sftime.cubble_df()`.
4+
35
# sftime 0.3.0
46

57
* Add a dedicated `tidyr::drop_na()` method for `sftime` objects. (See the same recent addition for `sf` objects [#1975](https://github.com/r-spatial/sf/pull/1975/)).

R/sftime.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ st_as_sftime.sftraj <- function(x, ...) {
757757
#' @inheritParams cubble::make_spatial_sf
758758
#' @examples
759759
#' # convert a cubble_df object from package cubble to an sftime object
760-
#' if (requireNamespace("cubble", quietly = TRUE, versionCheck = "0.3.0")) {
760+
#' if (requireNamespace("cubble", quietly = TRUE, versionCheck = list(op = ">=", version = "0.3.0"))) {
761761
#'
762762
#' # get a cubble_df object
763763
#' data("climate_aus", package = "cubble")
@@ -773,7 +773,7 @@ st_as_sftime.sftraj <- function(x, ...) {
773773
#' @export
774774
st_as_sftime.cubble_df <- function(x, ..., sfc = NULL, crs, silent = FALSE) {
775775

776-
if (! requireNamespace("cubble", quietly = TRUE, versionCheck = "0.3.0"))
776+
if (! requireNamespace("cubble", quietly = TRUE, versionCheck = list(op = ">=", version = "0.3.0")))
777777
stop("You need the `cubble` package (>= 0.3.0) to use this function. Install that first.")
778778

779779
# make sure the cubble_df object has the right format

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ install_github("r-spatial/sftime")
4949

5050
## Acknowledgment
5151

52-
This project gratefully acknowledges financial [support](https://www.r-consortium.org/projects) from the
52+
This project gratefully acknowledges financial [support](https://r-consortium.org/all-projects/2020-group-1.html#spatiotemporal-data-and-analytics) from the
5353

5454
<a href="https://r-consortium.org/all-projects/2020-group-1.html#spatiotemporal-data-and-analytics">
5555
<img src="https://r-consortium.org/images/RConsortium_Horizontal_Pantone.webp" width="300">

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ install_github("r-spatial/sftime")
5252
## Acknowledgment
5353

5454
This project gratefully acknowledges financial
55-
[support](https://www.r-consortium.org/projects) from the
55+
[support](https://r-consortium.org/all-projects/2020-group-1.html#spatiotemporal-data-and-analytics)
56+
from the
5657

5758
<a href="https://r-consortium.org/all-projects/2020-group-1.html#spatiotemporal-data-and-analytics">
5859
<img src="https://r-consortium.org/images/RConsortium_Horizontal_Pantone.webp" width="300">

man/st_as_sftime.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)