Rel (#146)

* prep for release * respond to CRAN comments
ropensci · Oct 8, 2020 · d3fb282 · d3fb282
1 parent 44901c6
commit d3fb282
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 18 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: tidyhydat
 Title: Extract and Tidy Canadian 'Hydrometric' Data
-Version: 0.5.0.9000
+Version: 0.5.1
 Authors@R: c(person("Sam", "Albers", email = "[email protected]", role = c("aut", "cre"),
     comment = c(ORCID = "0000-0002-9270-7884")),
     person("David", "Hutchinson", email = "[email protected]", role = "ctb"),
@@ -13,13 +13,13 @@ Authors@R: c(person("Sam", "Albers", email = "[email protected]", role = c("a
             comment = "Reviewed for rOpenSci")
     )
 Description: Provides functions to access historical and real-time national 'hydrometric'
-    data from Water Survey of Canada data sources (<http://dd.weather.gc.ca/hydrometric/csv/> and
-    <http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/>) and then applies tidy data principles.
+    data from Water Survey of Canada data sources (<https://dd.weather.gc.ca/hydrometric/csv/> and
+    <https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/>) and then applies tidy data principles.
 License: Apache License (== 2.0) | file LICENSE
 URL: https://docs.ropensci.org/tidyhydat/
 BugReports: https://github.com/ropensci/tidyhydat/issues
 Depends: 
-    R (>= 3.2.0)
+    R (>= 3.2.3)
 Imports: 
     cli (>= 1.0.0),
     crayon (>= 1.3.4),

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
-# tidyhydat 0.5.0.9000
+# tidyhydat 0.5.1
 - Replace `class(x) ==` with `inherits`
+- Fix bug and added corresponding tests where a request for multiple stations to `realtime_dd` would fail if any data was missing
+- Update internal data
+- Fix all non-secure or borken links
 
 # tidyhydat 0.5.0
 

diff --git a/R/download.R b/R/download.R
@@ -70,7 +70,7 @@ download_hydat <- function(dl_hydat_here = NULL) {
 
   ## Create the link to download HYDAT
   base_url <-
-    "http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/"
+    "https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/"
 
   # Run network check
   network_check(base_url)

diff --git a/R/tidyhydat-package.R b/R/tidyhydat-package.R
@@ -16,7 +16,7 @@
 #'  \itemize{
 #'   \item use the \code{download_hydat()} function.
 #'   \item If that fails you can download directly from this link:
-#'   \url{http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www}
+#'   \url{https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www}
 #'   }
 #' 
 #' For more information on tidy data please see
@@ -30,9 +30,9 @@
 #'    \item Please see this description of the database: 
 #'    \url{https://www.canada.ca/en/environment-climate-change/services/water-overview/quantity/monitoring/survey/data-products-services/national-archive-hydat.html}
 #'    \item This page is landing page for technical description of HYDAT:
-#'    \url{http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/}
+#'    \url{https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/}
 #'    \item This page links to a document that outlines database table definitions:
-#'    \url{http://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/HYDAT_Definition_EN.pdf}
+#'    \url{https://collaboration.cmc.ec.gc.ca/cmc/hydrometrics/www/HYDAT_Definition_EN.pdf}
 #'    \item This FAQ provides a helpful list of ECCC data source questions:
 #'    \url{https://wateroffice.ec.gc.ca/contactus/faq_e.html}
 #'    }

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,4 +1,26 @@
-tidhydat 0.5.0
+tidhydat 0.5.1
+=========================
+## Re-submission note
+- Fix all non-secure or borken links
+
+## NEWS
+- Replace `class(x) ==` with `inherits`
+- Fix bug and added corresponding tests where a request for multiple stations to `realtime_dd` would fail if any data was missing
+- Update internal data
+
+## Test environments
+* win-builder (via `devtools::check_win_devel()` and `devtools::check_win_release()`)
+* local Windows 10, R 4.0.2 (via R CMD check --as-cran)
+* ubuntu-20.04, r: 'release' (github actions)
+* ubuntu-20.04, r: 'devel' (github actions)
+* macOS,        r: 'release' (github actions)
+* windows,      r: 'release' (github actions)
+* Fedora Linux, R-devel, clang, gfortran - r-hub
+* Debian Linux, R-release, GCC (debian-gcc-release) - r-hub
+* Windows Server 2008 R2 SP1, R-devel, 32/64 bit - r-hub
+
+
+tidyhydat 0.5.0
 =========================
 ## Re-submission note
 * Vignette linked changed to canonical form. 

diff --git a/man/tidyhydat-package.Rd b/man/tidyhydat-package.Rd
diff --git a/release_process.md b/release_process.md
@@ -25,13 +25,12 @@ library(rhub)
 check_with_rdevel()
 check_for_cran()
 check_on_windows()
-check_on_macos()
 ```
 
 ## Run this in the console
 ```
 R CMD build tidyhydat
-R CMD check tidyhydat_0.5.0.tar.gz --as-cran ## or whatever the package name is
+R CMD check tidyhydat_0.5.1.tar.gz --as-cran ## or whatever the package name is
 ```
 
 ## Documentation

diff --git a/vignettes/tidyhydat_example_analysis.Rmd b/vignettes/tidyhydat_example_analysis.Rmd
@@ -24,7 +24,7 @@ knitr::opts_chunk$set(echo = TRUE,
 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`. 
 
 ## Familiarity with the tidyverse
-`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:
+`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:
 
  - `dplyr`: https://dplyr.tidyverse.org/
  - `tidyr`: https://tidyr.tidyverse.org/