Update stations list link and add tests to ensure data is recent in f…

…uture.
ropensci · Jan 27, 2025 · 9d017e9 · 9d017e9
1 parent 3a9ce63
commit 9d017e9
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 14 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: weathercan
 Type: Package
 Title: Download Weather Data from Environment and Climate Change Canada
-Version: 0.7.2.9000
+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")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,5 @@
-# weathercan (development version)
+# weathercan 0.7.3
+- Switch stations inventory list to new location
 
 # weathercan 0.7.2
 - Fix normals to work with new ECCC data format

diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/R/weathercan-package.R b/R/weathercan-package.R
@@ -68,17 +68,21 @@ NULL
   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")

diff --git a/data/codes.rda b/data/codes.rda
diff --git a/data/flags.rda b/data/flags.rda
diff --git a/data/glossary.rda b/data/glossary.rda
diff --git a/data/glossary_normals.rda b/data/glossary_normals.rda
diff --git a/data/kamloops.rda b/data/kamloops.rda
diff --git a/data/kamloops_day.rda b/data/kamloops_day.rda
diff --git a/data/pg.rda b/data/pg.rda
diff --git a/inst/extdata/stations.rds b/inst/extdata/stations.rds
diff --git a/release_script.R b/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 --------------------

diff --git a/tests/testthat/test_00_onLoad.R b/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"))

diff --git a/tests/testthat/test_03_station_dl.R b/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

diff --git a/weathercan.Rproj b/weathercan.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 03f10167-c7d2-438e-98c3-52cbb5d1948c
 
 RestoreWorkspace: Default
 SaveWorkspace: Default