Skip to content

Commit a078e7f

Browse files
committed
fix: testing issues
* pin epiprocess to ds/r6-clean branch in DESCRIPTION * update renv.lock with latest epiprocess ds/r6-clean commit * update as_of call to epix_as_of * run.R no longer overwrites use_crew from _targets.yml
1 parent c73af47 commit a078e7f

File tree

5 files changed

+31
-29
lines changed

5 files changed

+31
-29
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ VignetteBuilder:
4444
Remotes:
4545
cmu-delphi/epidatr,
4646
cmu-delphi/epipredict,
47-
cmu-delphi/epiprocess,
47+
cmu-delphi/epiprocess@ds/r6-clean,
4848
dajmcdon/smoothqr
4949
Encoding: UTF-8
5050
Config/testthat/edition: 3

R/looping.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ slide_forecaster <- function(data,
109109

110110
# append the truth data
111111
true_value <- archive %>%
112-
as_of(archive$versions_end) %>%
112+
epiprocess::epix_as_of(archive$versions_end) %>%
113113
select(geo_value, time_value, !!outcome) %>%
114114
rename(true_value = !!outcome)
115115
res %<>%

R/manage_S3.R

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ manage_S3_forecast_cache <- function(rel_cache_dir = NULL,
2828

2929
project_prefix <- paste0(prefix, "/", tar_project, "/")
3030
s3b <- get_bucket(bucket_name, prefix = project_prefix)
31-
print(paste0(direction, "ing:"))
32-
print(paste("local:", cache_path))
33-
print(paste("remote:", prefix))
31+
cli::cli_inform(c(
32+
"{direction}ing cache to S3 bucket '{bucket_name}'",
33+
"i" = "Local cache path: {cache_path}",
34+
"i" = "AWS prefix: {prefix}"
35+
))
3436
if (direction == "sync") {
3537
if (verbose) {
3638
s3sync(cache_path, s3b, prefix = project_prefix)

renv.lock

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -812,14 +812,15 @@
812812
},
813813
"epidatr": {
814814
"Package": "epidatr",
815-
"Version": "1.1.4",
815+
"Version": "1.1.5",
816816
"Source": "GitHub",
817817
"RemoteType": "github",
818818
"RemoteHost": "api.github.com",
819-
"RemoteUsername": "cmu-delphi",
820819
"RemoteRepo": "epidatr",
821-
"RemoteRef": "dev",
822-
"RemoteSha": "a53ad5671cc072518feaed605637d0bf27fde3e6",
820+
"RemoteUsername": "cmu-delphi",
821+
"RemotePkgRef": "cmu-delphi/epidatr",
822+
"RemoteRef": "HEAD",
823+
"RemoteSha": "626c30bc07f4aae3c3e6a6c6b825a6cd5eee1ce7",
823824
"Requirements": [
824825
"MMWRweek",
825826
"R",
@@ -838,33 +839,32 @@
838839
"usethis",
839840
"xml2"
840841
],
841-
"Hash": "c495a916c7f3aba065e09fcaceca4b01"
842+
"Hash": "5c76408a283a0b20c6fd455fcd1c44b6"
842843
},
843844
"epipredict": {
844845
"Package": "epipredict",
845-
"Version": "0.0.10",
846+
"Version": "0.0.13",
846847
"Source": "GitHub",
848+
"Remotes": "cmu-delphi/epidatr, cmu-delphi/epiprocess, dajmcdon/smoothqr",
847849
"RemoteType": "github",
848-
"RemoteUsername": "cmu-delphi",
850+
"RemoteHost": "api.github.com",
849851
"RemoteRepo": "epipredict",
852+
"RemoteUsername": "cmu-delphi",
853+
"RemotePkgRef": "cmu-delphi/epipredict",
850854
"RemoteRef": "HEAD",
851-
"RemoteSha": "7a4ea55437f6415e86b34d0fb7079ba7e8d5e286",
852-
"RemoteHost": "api.github.com",
853-
"Remotes": "cmu-delphi/epidatr, cmu-delphi/epiprocess, dajmcdon/smoothqr",
855+
"RemoteSha": "8a516e96bbd0d647291700c32da9d4c5182e9f13",
854856
"Requirements": [
855857
"R",
856858
"checkmate",
857859
"cli",
858860
"distributional",
859861
"dplyr",
860862
"epiprocess",
861-
"fs",
862863
"generics",
864+
"ggplot2",
863865
"glue",
864866
"hardhat",
865-
"lifecycle",
866867
"magrittr",
867-
"methods",
868868
"parsnip",
869869
"quantreg",
870870
"recipes",
@@ -874,26 +874,26 @@
874874
"tibble",
875875
"tidyr",
876876
"tidyselect",
877-
"usethis",
877+
"tsibble",
878878
"vctrs",
879879
"workflows"
880880
],
881-
"Hash": "d59cd87c1aef1bfb1afce0bbf9b7c9c5"
881+
"Hash": "c8f4f260388bc61e562f599c00c73fa6"
882882
},
883883
"epiprocess": {
884884
"Package": "epiprocess",
885-
"Version": "0.7.5",
885+
"Version": "0.7.7",
886886
"Source": "GitHub",
887+
"Remotes": "cmu-delphi/epidatr, reconverse/outbreaks, glmgen/genlasso",
887888
"RemoteType": "github",
888-
"RemoteUsername": "cmu-delphi",
889-
"RemoteRepo": "epiprocess",
890-
"RemoteRef": "HEAD",
891-
"RemoteSha": "f29654512c4784c5a622b76b0ad13c0b43004d48",
892889
"RemoteHost": "api.github.com",
893-
"Remotes": "cmu-delphi/epidatr, reconverse/outbreaks, glmgen/genlasso",
890+
"RemoteRepo": "epiprocess",
891+
"RemoteUsername": "cmu-delphi",
892+
"RemotePkgRef": "cmu-delphi/epiprocess@ds/r6-clean",
893+
"RemoteRef": "ds/r6-clean",
894+
"RemoteSha": "dc98f38af3ddfba7b669fca57db2acad686728ce",
894895
"Requirements": [
895896
"R",
896-
"R6",
897897
"checkmate",
898898
"cli",
899899
"data.table",
@@ -916,7 +916,7 @@
916916
"utils",
917917
"vctrs"
918918
],
919-
"Hash": "d408b669e3b55d445b76272049fdb07e"
919+
"Hash": "404be32a2e3ee6f4f4121fa4f3f22841"
920920
},
921921
"evaluate": {
922922
"Package": "evaluate",

scripts/run.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ tar_manifest()
6161
if (debug_mode) {
6262
tar_make(callr_function = NULL, use_crew = FALSE)
6363
} else {
64-
tar_make(use_crew = TRUE)
64+
tar_make()
6565
}
6666

6767
if (use_shiny) {

0 commit comments

Comments
 (0)