Update v0.7.3

.github/.gitignore

@@ -0,0 +1 @@
+*.html

.gitignore

@@ -1,4 +1,3 @@
-.gitignore
 .Rproj.user
 .Rhistory
 .RData

DESCRIPTION

@@ -1,12 +1,17 @@
 Package: weathercan
 Type: Package
 Title: Download Weather Data from Environment and Climate Change Canada
-Version: 0.7.2
+Version: 0.7.3
 Authors@R: c(
      person("Steffi", "LaZerte", email = "[email protected]", role = c("aut","cre"), comment = c(ORCID = "0000-0002-7690-8360")),
      person("Sam", "Albers", email = "[email protected]", role = c("ctb"), comment = c(ORCID = "0000-0002-9270-7884")),
      person("Nick", "Brown", email = "[email protected]", role = c("ctb"), comment = c(ORCID = "0000-0002-2719-0671")),
-     person("Kevin", "Cazelles", email = "[email protected]", role = c("ctb"), comment = c(ORCID = "0000-0001-6619-9874")))
+     person("Kevin", "Cazelles", email = "[email protected]", role = c("ctb"), comment = c(ORCID = "0000-0001-6619-9874")),
+     person("Shandiya", "Balasubramaniam", role = "ctb", comment = c(ORCID = "0000-0001-9928-9964")),
+     person("Mark", "Ciechanowski", role = "ctb"),
+     person("Jeremy", "Selva", role = "ctb"),
+     person("Kelli", "Johnson", email = "[email protected]", role = "ctb")
+     )
 Description: Provides means for downloading historical weather data from 
     the Environment and Climate Change Canada website 
     (<https://climate.weather.gc.ca/historical_data/search_historic_data_e.html>). 

NEWS.md

@@ -1,4 +1,9 @@
-# weathercan (development version)
+# weathercan 0.7.3
+- Switch stations inventory list to new location
+- Don't try to download future weather
+- Better test coverage (#149; 🙏 thanks @shandiya, @mciechanumich!)
+- Replaced superseded dplyr functions (#150; 🙏 thanks @JauntyJJS, @RichardLitt!)
+- Fixed test coverage GitHub Action (🙏 thanks @kellijohnson-NOAA!)
 
 # weathercan 0.7.2
 - Fix normals to work with new ECCC data format

R/weather.R

@@ -187,10 +187,16 @@
       msg.start <- "earliest date"
     } else {
       s.start <- as.Date(start)
+      if(s.start > Sys.Date()) s.start <- Sys.Date()
       msg.start <- start
     }
 
-    if(is.null(end)) s.end <- Sys.Date() else s.end <- as.Date(end)
+    if(is.null(end)) {
+      s.end <- Sys.Date()
+    } else {
+      s.end <- as.Date(end)
+      if(s.end > Sys.Date()) s.end <- Sys.Date()
+    }
     msg.end <- as.character(s.end)
 
     dates <- lubridate::interval(s.start, s.end)
@@ -381,6 +387,7 @@
 }
 
 weather_single <- function(date_range, s, interval, encoding) {
+
   w <- dplyr::tibble(date_range = date_range)
   w <- dplyr::mutate(w, html = purrr::map(.data$date_range,
                                     ~ weather_html(station_id = s,

R/weathercan-package.R

@@ -68,17 +68,21 @@
   get_html <<- memoise::memoise(get_html, ~memoise::timeout(24 * 60 * 60))
   normals_html <<- memoise::memoise(normals_html, ~memoise::timeout(24 * 60 * 60))
 
-  options(weathercan.urls.weather =
-            "https://climate.weather.gc.ca/climate_data/bulk_data_e.html",
-          weathercan.urls.normals =
-            "https://climate.weather.gc.ca/climate_normals/bulk_data_e.html",
-          # Download from google drive: https://stackoverflow.com/a/50533232/3362144
-          weathercan.urls.stations =
-            paste0("https://drive.google.com/uc?export=download&id=",
-                   "1HDRnj41YBWpMioLPwAFiLlK4SK8NV72C"),
-          weathercan.urls.stations.normals =
-          "https://climate.weather.gc.ca/climate_normals/station_inventory_e.html",
-          weathercan.time.message = FALSE)
+  options(
+    weathercan.urls.weather =
+      "https://climate.weather.gc.ca/climate_data/bulk_data_e.html",
+    weathercan.urls.normals =
+      "https://climate.weather.gc.ca/climate_normals/bulk_data_e.html",
+    # Download from google drive: https://stackoverflow.com/a/50533232/3362144
+    weathercan.urls.stations =
+      paste0("https://collaboration.cmc.ec.gc.ca/cmc/climate/",
+             "Get_More_Data_Plus_de_donnees/Station%20Inventory%20EN.csv"),
+             #weathercan.urls.stations =
+    #  paste0("https://drive.google.com/uc?export=download&id=",
+    #         "1HDRnj41YBWpMioLPwAFiLlK4SK8NV72C"),
+    weathercan.urls.stations.normals =
+      "https://climate.weather.gc.ca/climate_normals/station_inventory_e.html",
+    weathercan.time.message = FALSE)
 
   # CRAN Note avoidance
   if(getRversion() >= "2.15.1")

release_script.R

@@ -77,6 +77,7 @@ usethis::use_github_release()
 ## Prep for next
 usethis::pr_init("dev")
 usethis::use_dev_version()
+usethis::pr_push()
 
 
 # Good practices --------------------

tests/testthat/test_00_onLoad.R

@@ -9,7 +9,8 @@ test_that("URLS correctly set", {
   expect_true(stringr::str_detect(w, "climate.weather.gc.ca"))
 
   expect_type(w <- getOption("weathercan.urls.stations"), "character")
-  expect_true(stringr::str_detect(w, "drive.google.com"))
+  #expect_true(stringr::str_detect(w, "drive.google.com"))
+  expect_true(stringr::str_detect(w, "collaboration.cmc.ec.gc.ca"))
 
   expect_type(w <- getOption("weathercan.urls.stations.normals"), "character")
   expect_true(stringr::str_detect(w, "climate.weather.gc.ca"))

tests/testthat/test_03_station_dl.R

@@ -71,6 +71,9 @@ test_that("stations_dl() runs and updates data", {
   expect_type(s$meta, "list") %>%
     expect_length(2)
 
+  # Ensure that we're getting recent data
+  expect_equal(max(s$stn$end, na.rm = TRUE), lubridate::year(Sys.Date()))
+
   # stations_read() ----
 
   # Without local file, use package file

vignettes/.gitignore

@@ -0,0 +1,3 @@
+*.html
+*.R
+normals_cache

weathercan.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 03f10167-c7d2-438e-98c3-52cbb5d1948c
 
 RestoreWorkspace: Default
 SaveWorkspace: Default