Merge pull request #419 from mrc-ide/glue-fix

Backport glue fix

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dust
 Title: Iterate Multiple Realisations of Stochastic Models
-Version: 0.15.2
+Version: 0.15.3
 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
                     email = "[email protected]"),
              person("Alex", "Hill", role = "aut"),

R/compile.R

@@ -129,8 +129,7 @@ substitute_dust_template <- function(data, src, dest) {
 
 glue_whisker <- function(template, data) {
   stopifnot(length(template) == 1L)
-  glue::glue(template, .envir = data, .open = "{{", .close = "}}",
-             .trim = FALSE)
+  glue::glue_data(data, template, .open = "{{", .close = "}}", .trim = FALSE)
 }
 
 

README.md

@@ -74,21 +74,21 @@ We use `dust` to power several epidemiological models. Public examples include:
 
 ## Installation
 
-To install `dust`:
+Please install from our [r-universe](https://mrc-ide.r-universe.dev/):
 
-```r
-# install.packages("drat") # -- if you don't have drat installed
-drat:::add("ncov-ic")
-install.packages("dust")
+```
+install.packages(
+  "dust",
+  repos = c("https://mrc-ide.r-universe.dev", "https://cloud.r-project.org"))
 ```
 
-You will need a compiler to install dependencies for the package, and to build any models with dust.  `dust` uses `pkgbuild` to build its shared libraries so use `pkgbuild::check_build_tools()` to see if your system is ok to use.
-
-The development version of the package can be installed directly from GitHub if you prefer with:
+If you prefer, you can install from GitHub with remotes:
 
-```r
-remotes::install_github("mrc-ide/dust", upgrade = FALSE)
 ```
+remotes::install_github("mrc-ide/dust")
+```
+
+You will need a compiler to install dependencies for the package, and to build any models with dust.  `dust` uses `pkgbuild` to build its shared libraries so use `pkgbuild::check_build_tools()` to see if your system is ok to use.
 
 ## License