diff --git a/docker/depends/pecan.depends.R b/docker/depends/pecan.depends.R index 39baa6664b3..64ef77eb10d 100644 --- a/docker/depends/pecan.depends.R +++ b/docker/depends/pecan.depends.R @@ -17,14 +17,21 @@ condense_version_requirements <- function(specs) { gsub("[^[:digit:].-]+", "", specs)) if ((length(unique(versions)) > 1) && any(!grepl(">", specs))) { - # can't assume the latest version works for all, so give up. - # we *could* write more to handle this case if needed, but it seems very rare: + # Can't assume the latest version works for all, so give up. + # We *could* write more to handle this case if needed, but it seems very rare: # available.packages() shows `<=` or `==` deps in just 4 of 20297 CRAN packages + # + # Since the package name wasn't passed in here, we unhelpfully print *just* + # the offending versions and send the user back to the CSV for details. stop( - "pecan_depends only knows how to resolve minimum dependency versions ", - "(e.g. `>= 2.8.1`). Exact (`==`) or maximum versions (`<=`) ", - " are only allowed if all PEcAn packages declare the same version.", - "Problem seen in (", paste(dQuote(specs), collapse = ", "), ")") + "Found multiple version requirements (", + paste(dQuote(specs), collapse = ", "), ") for the same dependency, ", + "and not all are minimum versions (e.g. `>= x.y.z`). ", + "Exact (`==`) or maximum (`<=`) version reuirements are only allowed ", + "if all PEcAn packages declare the same version. ", + "Sorry, this function doesn't know which dependency caused this. ", + "To find it, search for these version strings in ", + "'pecan_package_dependencies.csv'.") } specs[versions == max(versions)] } diff --git a/docker/depends/pecan_package_dependencies.csv b/docker/depends/pecan_package_dependencies.csv index d5a8c9cd1e9..fc14f5ee330 100644 --- a/docker/depends/pecan_package_dependencies.csv +++ b/docker/depends/pecan_package_dependencies.csv @@ -479,7 +479,6 @@ "rmarkdown",">= 2.19","modules/assim.batch","Suggests",FALSE "rmarkdown",">= 2.19","modules/meta.analysis","Suggests",FALSE "rmarkdown",">= 2.19","modules/photosynthesis","Suggests",FALSE -"roxygen2","== 6.1.0","models/cable","Roxygen",FALSE "roxygen2","== 7.2.3","base/all","Roxygen",FALSE "roxygen2","== 7.2.3","base/db","Roxygen",FALSE "roxygen2","== 7.2.3","base/logger","Roxygen",FALSE @@ -491,6 +490,7 @@ "roxygen2","== 7.2.3","base/workflow","Roxygen",FALSE "roxygen2","== 7.2.3","models/basgra","Roxygen",FALSE "roxygen2","== 7.2.3","models/biocro","Roxygen",FALSE +"roxygen2","== 7.2.3","models/cable","Roxygen",FALSE "roxygen2","== 7.2.3","models/clm45","Roxygen",FALSE "roxygen2","== 7.2.3","models/dalec","Roxygen",FALSE "roxygen2","== 7.2.3","models/dvmdostem","Roxygen",FALSE diff --git a/models/cable/DESCRIPTION b/models/cable/DESCRIPTION index 621b64ba9ad..c8576cce4f1 100644 --- a/models/cable/DESCRIPTION +++ b/models/cable/DESCRIPTION @@ -22,4 +22,4 @@ Copyright: Authors LazyLoad: yes LazyData: FALSE Encoding: UTF-8 -RoxygenNote: 6.1.0 +RoxygenNote: 7.2.3 diff --git a/models/cable/man/write_restart.CABLE.Rd b/models/cable/man/write_restart.CABLE.Rd index 52945b79ee6..aad831a79c9 100644 --- a/models/cable/man/write_restart.CABLE.Rd +++ b/models/cable/man/write_restart.CABLE.Rd @@ -4,8 +4,7 @@ \alias{write_restart.CABLE} \title{Write restart template for SDA} \usage{ -write_restart.CABLE(outdir, runid, start.time, stop.time, settings, - new.state) +write_restart.CABLE(outdir, runid, start.time, stop.time, settings, new.state) } \arguments{ \item{start.time}{Time of current assimilation step}