Merge pull request #17 from mrc-ide/use-conan-v2

Use conan v2
mrc-ide · Dec 12, 2023 · b1e671c · b1e671c
2 parents 42895be + 7726afd
commit b1e671c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -20,9 +20,9 @@ Imports:
     rprojroot,
     withr
 Suggests:
-    conan,
+    conan2,
     mockery,
     testthat (>= 3.0.0)
 Config/testthat/edition: 3
 Remotes:
-    mrc-ide/conan@main-v2
+    mrc-ide/conan2@main
diff --git a/R/configure.R b/R/configure.R
@@ -56,7 +56,7 @@ hermod_configure <- function(driver, ..., root = NULL) {
 ##'
 ##' @param provision Provision a library. Works with conan, and must
 ##'   accept `method`, `config`, `path_root` followed by `...` to pass
-##'   through to `conan::conan_configure`. It is expected this
+##'   through to `conan2::conan_configure`. It is expected this
 ##'   function will trigger running conan to provision a library.
 ##'
 ##' @export

diff --git a/drivers/windows/DESCRIPTION b/drivers/windows/DESCRIPTION
@@ -17,7 +17,7 @@ URL: https://github.com/mrc-ide/hermod.windows
 BugReports: https://github.com/mrc-ide/hermod.windows/issues
 Imports:
     cli,
-    conan (>= 1.9.0),
+    conan2,
     crayon,
     fs,
     glue,
@@ -34,4 +34,4 @@ Suggests:
     withr
 Config/testthat/edition: 3
 Remotes:
-    mrc-ide/conan@main-v2
+    mrc-ide/conan2@main
diff --git a/drivers/windows/R/provision.R b/drivers/windows/R/provision.R
@@ -1,6 +1,6 @@
 ## windows-specific provisioning code, called from hermod
 windows_provision <- function(method, config, path_root, environment, ...) {
-  conan_config <- conan::conan_configure(
+  conan_config <- conan2::conan_configure(
     method,
     path = path_root,
     path_lib = config$path_lib,
@@ -10,7 +10,7 @@ windows_provision <- function(method, config, path_root, environment, ...) {
 
   id <- ids::random_id()
   path <- file.path(path_root, "hermod", "provision", id, "conan.R")
-  conan::conan_write(conan_config, path)
+  conan2::conan_write(conan_config, path)
 
   path_batch <- write_batch_provision_script(id, config, path_root)
 
@@ -35,7 +35,7 @@ windows_provision <- function(method, config, path_root, environment, ...) {
            "failure") # "ERROR", "CANCELLED" or unknown status
   }
 
-  conan::conan_watch(
+  conan2::conan_watch(
     status,
     function() readlines_if_exists(path_log, warn = FALSE),
     show_log = conan_config$show_log,

diff --git a/man/hermod_driver.Rd b/man/hermod_driver.Rd
diff --git a/tests/testthat/helper-hermod.R b/tests/testthat/helper-hermod.R
@@ -61,7 +61,7 @@ elsewhere_result <- function(id, config, path_root) {
 
 
 elsewhere_provision <- function(method, config, path_root, environment, ...) {
-  conan_config <- conan::conan_configure(
+  conan_config <- conan2::conan_configure(
     method,
     path = path_root,
     path_lib = file.path("hermod", "lib"),
@@ -74,7 +74,7 @@ elsewhere_provision <- function(method, config, path_root, environment, ...) {
     file.copy(file.path(path_root, conan_config$script),
               file.path(path_there, conan_config$script),
               overwrite = TRUE))
-  withr::with_dir(path_there, conan::conan_run(conan_config))
+  withr::with_dir(path_there, conan2::conan_run(conan_config))
 }