diff --git a/DESCRIPTION b/DESCRIPTION index a4944e73..e0831560 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: odin Title: ODE Generation and Integration -Version: 1.5.10 +Version: 1.5.11 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"), email = "rich.fitzjohn@gmail.com"), person("Thibaut", "Jombart", role = "ctb"), diff --git a/README.md b/README.md index cd6921a5..6a34cb2e 100644 --- a/README.md +++ b/README.md @@ -141,12 +141,12 @@ Install odin from CRAN with install.packages("odin") ``` -Alternatively, you can install a potentially more recent version of odin from the [`mrc-ide` drat repository](https://mrc-ide.github.io/drat/) +Alternatively, you can install a potentially more recent version of odin from the [`mrc-ide` universe](https://mrc-ide.r-universe.dev/) ```r -# install.packages("drat") # -- if you don't have drat installed -drat:::add("mrc-ide") -install.packages("odin") +install.packages( + "odin", + 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 odin. Windows users should install [Rtools](https://cran.r-project.org/bin/windows/Rtools/). See the relevant section in [R-admin](https://cran.r-project.org/doc/manuals/r-release/R-admin.html#The-Windows-toolset) for advice. Be sure to select the "edit PATH" checkbox during installation or the tools will not be found. diff --git a/tests/testthat/test-package.R b/tests/testthat/test-package.R index a1c6aa35..66594364 100644 --- a/tests/testthat/test-package.R +++ b/tests/testthat/test-package.R @@ -31,6 +31,7 @@ test_that("generate package", { test_that("interpolation", { skip_on_windows_gha() + skip_on_os("mac") res <- odin_create_package("interpolation", "examples/interpolate_odin.R") on.exit(res$cleanup()) diff --git a/tests/testthat/test-run-examples.R b/tests/testthat/test-run-examples.R index 6d1c5705..30dd241e 100644 --- a/tests/testthat/test-run-examples.R +++ b/tests/testthat/test-run-examples.R @@ -7,6 +7,7 @@ test_that_odin("basic interface", { ## M1. These tests need refactoring anyway. skip_on_cran() skip_for_target("js") # some tolerance issues that are not worth chasing + skip_on_os("mac") re <- "([[:alnum:]]+)_odin\\.R$" files <- dir("examples", re) base <- sub(re, "\\1", files) @@ -203,6 +204,7 @@ test_that_odin("lv", { test_that_odin("dde", { skip_if_not_installed("dde") skip_for_target("js") + skip_on_os("mac") ## This test is failing on M1 Mac checks, with tolerance needing ## tweaking for one of the examples, probably the Lorenz attractor ## as being chaotic, deviations are expected to grow. Without access