Skip to content

Commit d3fb282

Browse files
authored
Rel (#146)
* prep for release * respond to CRAN comments
1 parent 44901c6 commit d3fb282

File tree

8 files changed

+42
-18
lines changed

8 files changed

+42
-18
lines changed

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: tidyhydat
22
Title: Extract and Tidy Canadian 'Hydrometric' Data
3-
Version: 0.5.0.9000
3+
Version: 0.5.1
44
Authors@R: c(person("Sam", "Albers", email = "sam.albers@gov.bc.ca", role = c("aut", "cre"),
55
comment = c(ORCID = "0000-0002-9270-7884")),
66
person("David", "Hutchinson", email = "david.hutchinson@canada.ca", role = "ctb"),
@@ -13,13 +13,13 @@ Authors@R: c(person("Sam", "Albers", email = "sam.albers@gov.bc.ca", role = c("a
1313
comment = "Reviewed for rOpenSci")
1414
)
1515
Description: Provides functions to access historical and real-time national 'hydrometric'
16-
data from Water Survey of Canada data sources (<http://dd.weather.gc.ca/hydrometric/csv/> and
17-
<http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/>) and then applies tidy data principles.
16+
data from Water Survey of Canada data sources (<https://dd.weather.gc.ca/hydrometric/csv/> and
17+
<https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/>) and then applies tidy data principles.
1818
License: Apache License (== 2.0) | file LICENSE
1919
URL: https://docs.ropensci.org/tidyhydat/
2020
BugReports: https://github.com/ropensci/tidyhydat/issues
2121
Depends:
22-
R (>= 3.2.0)
22+
R (>= 3.2.3)
2323
Imports:
2424
cli (>= 1.0.0),
2525
crayon (>= 1.3.4),

NEWS.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# tidyhydat 0.5.0.9000
1+
# tidyhydat 0.5.1
22
- Replace `class(x) ==` with `inherits`
3+
- Fix bug and added corresponding tests where a request for multiple stations to `realtime_dd` would fail if any data was missing
4+
- Update internal data
5+
- Fix all non-secure or borken links
36

47
# tidyhydat 0.5.0
58

R/download.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ download_hydat <- function(dl_hydat_here = NULL) {
7070

7171
## Create the link to download HYDAT
7272
base_url <-
73-
"http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/"
73+
"https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/"
7474

7575
# Run network check
7676
network_check(base_url)

R/tidyhydat-package.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#' \itemize{
1717
#' \item use the \code{download_hydat()} function.
1818
#' \item If that fails you can download directly from this link:
19-
#' \url{http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www}
19+
#' \url{https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www}
2020
#' }
2121
#'
2222
#' For more information on tidy data please see
@@ -30,9 +30,9 @@
3030
#' \item Please see this description of the database:
3131
#' \url{https://www.canada.ca/en/environment-climate-change/services/water-overview/quantity/monitoring/survey/data-products-services/national-archive-hydat.html}
3232
#' \item This page is landing page for technical description of HYDAT:
33-
#' \url{http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/}
33+
#' \url{https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/}
3434
#' \item This page links to a document that outlines database table definitions:
35-
#' \url{http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/HYDAT_Definition_EN.pdf}
35+
#' \url{https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/HYDAT_Definition_EN.pdf}
3636
#' \item This FAQ provides a helpful list of ECCC data source questions:
3737
#' \url{https://wateroffice.ec.gc.ca/contactus/faq_e.html}
3838
#' }

cran-comments.md

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
1-
tidhydat 0.5.0
1+
tidhydat 0.5.1
2+
=========================
3+
## Re-submission note
4+
- Fix all non-secure or borken links
5+
6+
## NEWS
7+
- Replace `class(x) ==` with `inherits`
8+
- Fix bug and added corresponding tests where a request for multiple stations to `realtime_dd` would fail if any data was missing
9+
- Update internal data
10+
11+
## Test environments
12+
* win-builder (via `devtools::check_win_devel()` and `devtools::check_win_release()`)
13+
* local Windows 10, R 4.0.2 (via R CMD check --as-cran)
14+
* ubuntu-20.04, r: 'release' (github actions)
15+
* ubuntu-20.04, r: 'devel' (github actions)
16+
* macOS, r: 'release' (github actions)
17+
* windows, r: 'release' (github actions)
18+
* Fedora Linux, R-devel, clang, gfortran - r-hub
19+
* Debian Linux, R-release, GCC (debian-gcc-release) - r-hub
20+
* Windows Server 2008 R2 SP1, R-devel, 32/64 bit - r-hub
21+
22+
23+
tidyhydat 0.5.0
224
=========================
325
## Re-submission note
426
* Vignette linked changed to canonical form.

man/tidyhydat-package.Rd

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

release_process.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ library(rhub)
2525
check_with_rdevel()
2626
check_for_cran()
2727
check_on_windows()
28-
check_on_macos()
2928
```
3029

3130
## Run this in the console
3231
```
3332
R CMD build tidyhydat
34-
R CMD check tidyhydat_0.5.0.tar.gz --as-cran ## or whatever the package name is
33+
R CMD check tidyhydat_0.5.1.tar.gz --as-cran ## or whatever the package name is
3534
```
3635

3736
## Documentation

vignettes/tidyhydat_example_analysis.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ knitr::opts_chunk$set(echo = TRUE,
2424
The real power of `tidyhydat` comes with its ability to efficiently import hydrometric data into R which then can be used in conjunction with R's vast array of packages; `tidyhydat` gets hydrometric data into R and allows the user to start conducting data analysis as quickly as possible. This vignette is designed to take a user through two short examples of importing data using `tidyhydat` for use in hydrological visualization and analysis and will therefore use additional tools beyond simply the functions in `tidyhydat`.
2525

2626
## Familiarity with the tidyverse
27-
`tidyhydat` is designed to exist as a "tidy tool" that is complementary to the [tidyverse](https://CRAN.R-project.org/package=tidyverse) suite of packages. This vignette assumes some familiarity with basic tidy tools particularly `dplyr`, `tidyr`, `ggplot2` and `lubridate`. The [R for Data Science](http://r4ds.had.co.nz/) book by Garrett Grolemund and Hadley Wickham is an enormously useful book both for general R use and for `tidyhydat`. The following is a list of useful links to begin learning particular aspect of each `tidyverse` package:
27+
`tidyhydat` is designed to exist as a "tidy tool" that is complementary to the [tidyverse](https://CRAN.R-project.org/package=tidyverse) suite of packages. This vignette assumes some familiarity with basic tidy tools particularly `dplyr`, `tidyr`, `ggplot2` and `lubridate`. The [R for Data Science](https://r4ds.had.co.nz/) book by Garrett Grolemund and Hadley Wickham is an enormously useful book both for general R use and for `tidyhydat`. The following is a list of useful links to begin learning particular aspect of each `tidyverse` package:
2828

2929
- `dplyr`: https://dplyr.tidyverse.org/
3030
- `tidyr`: https://tidyr.tidyverse.org/

0 commit comments

Comments
 (0)