Skip to content

Commit

Permalink
bump roxygen again; all output files are unchanged
Browse files Browse the repository at this point in the history
  • Loading branch information
infotroph committed Jul 8, 2024
1 parent fbb7f00 commit e53481c
Show file tree
Hide file tree
Showing 45 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ALL_PKGS_D := $(BASE_D) $(MODULES_D) $(MODELS_D)

SETROPTIONS := "options(Ncpus = ${NCPUS})"

EXPECTED_ROXYGEN_VERSION := 7.3.1
EXPECTED_ROXYGEN_VERSION := 7.3.2
INSTALLED_ROXYGEN_VERSION := $(shell Rscript \
-e "if (requireNamespace('roxygen2', quietly = TRUE)) {" \
-e "cat(as.character(packageVersion('roxygen2')))" \
Expand Down
2 changes: 1 addition & 1 deletion base/all/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ Copyright: Authors
LazyData: true
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion base/db/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion base/logger/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ Suggests:
withr
License: BSD_3_clause + file LICENSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
2 changes: 1 addition & 1 deletion base/qaqc/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ LazyData: FALSE
Encoding: UTF-8
VignetteBuilder: knitr
Config/testthat/edition: 3
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion base/remote/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ License: BSD_3_clause + file LICENSE
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion base/settings/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Suggests:
testthat (>= 2.0.0),
withr
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
2 changes: 1 addition & 1 deletion base/utils/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ License: BSD_3_clause + file LICENSE
Copyright: Authors
LazyData: true
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
2 changes: 1 addition & 1 deletion base/visualization/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
2 changes: 1 addition & 1 deletion base/workflow/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ Suggests:
withr
Copyright: Authors
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ When it is time for everyone to update to a newer Roxygen, follow the same proce
* Run `make clean && make document` to be sure Roxygen has been run on all packages.
* Check the console output for warnings from Roxygen, and fix them as needed. New versions often get pickier about formatting issues that used to be considered minor.
* Run `./scripts/generate_dependencies.R` to update the version of Roxygen recorded as a Docker dependency.
* Grep the PEcAn folder for the string `7.3.1` to make sure no references were missed.
* Grep the PEcAn folder for the string `7.2.3` to make sure no references were missed.
- e.g. this time I found a remaining `RoxygenNote: 7.2.3` in models/cable/DESCRIPTION -- Make currently skips cable, so I redocumented it manually.
* Review all changes.
- The changes should mostly just consist of updated `RoxygenNote:` lines in all the DESCRIPTION files.
Expand Down
84 changes: 42 additions & 42 deletions docker/depends/pecan_package_dependencies.csv
Original file line number Diff line number Diff line change
Expand Up @@ -485,48 +485,48 @@
"rmarkdown",">= 2.19","modules/assim.batch","Suggests",FALSE
"rmarkdown",">= 2.19","modules/meta.analysis","Suggests",FALSE
"rmarkdown",">= 2.19","modules/photosynthesis","Suggests",FALSE
"roxygen2","== 7.3.1","base/all","Roxygen",FALSE
"roxygen2","== 7.3.1","base/db","Roxygen",FALSE
"roxygen2","== 7.3.1","base/logger","Roxygen",FALSE
"roxygen2","== 7.3.1","base/qaqc","Roxygen",FALSE
"roxygen2","== 7.3.1","base/remote","Roxygen",FALSE
"roxygen2","== 7.3.1","base/settings","Roxygen",FALSE
"roxygen2","== 7.3.1","base/utils","Roxygen",FALSE
"roxygen2","== 7.3.1","base/visualization","Roxygen",FALSE
"roxygen2","== 7.3.1","base/workflow","Roxygen",FALSE
"roxygen2","== 7.3.1","models/basgra","Roxygen",FALSE
"roxygen2","== 7.3.1","models/biocro","Roxygen",FALSE
"roxygen2","== 7.3.1","models/cable","Roxygen",FALSE
"roxygen2","== 7.3.1","models/clm45","Roxygen",FALSE
"roxygen2","== 7.3.1","models/dalec","Roxygen",FALSE
"roxygen2","== 7.3.1","models/dvmdostem","Roxygen",FALSE
"roxygen2","== 7.3.1","models/ed","Roxygen",FALSE
"roxygen2","== 7.3.1","models/fates","Roxygen",FALSE
"roxygen2","== 7.3.1","models/gday","Roxygen",FALSE
"roxygen2","== 7.3.1","models/jules","Roxygen",FALSE
"roxygen2","== 7.3.1","models/ldndc","Roxygen",FALSE
"roxygen2","== 7.3.1","models/linkages","Roxygen",FALSE
"roxygen2","== 7.3.1","models/lpjguess","Roxygen",FALSE
"roxygen2","== 7.3.1","models/maat","Roxygen",FALSE
"roxygen2","== 7.3.1","models/maespa","Roxygen",FALSE
"roxygen2","== 7.3.1","models/preles","Roxygen",FALSE
"roxygen2","== 7.3.1","models/sibcasa","Roxygen",FALSE
"roxygen2","== 7.3.1","models/sipnet","Roxygen",FALSE
"roxygen2","== 7.3.1","models/stics","Roxygen",FALSE
"roxygen2","== 7.3.1","models/template","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/allometry","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/assim.batch","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/assim.sequential","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/benchmark","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/data.atmosphere","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/data.land","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/data.remote","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/emulator","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/meta.analysis","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/photosynthesis","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/priors","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/rtm","Roxygen",FALSE
"roxygen2","== 7.3.1","modules/uncertainty","Roxygen",FALSE
"roxygen2","== 7.3.2","base/all","Roxygen",FALSE
"roxygen2","== 7.3.2","base/db","Roxygen",FALSE
"roxygen2","== 7.3.2","base/logger","Roxygen",FALSE
"roxygen2","== 7.3.2","base/qaqc","Roxygen",FALSE
"roxygen2","== 7.3.2","base/remote","Roxygen",FALSE
"roxygen2","== 7.3.2","base/settings","Roxygen",FALSE
"roxygen2","== 7.3.2","base/utils","Roxygen",FALSE
"roxygen2","== 7.3.2","base/visualization","Roxygen",FALSE
"roxygen2","== 7.3.2","base/workflow","Roxygen",FALSE
"roxygen2","== 7.3.2","models/basgra","Roxygen",FALSE
"roxygen2","== 7.3.2","models/biocro","Roxygen",FALSE
"roxygen2","== 7.3.2","models/cable","Roxygen",FALSE
"roxygen2","== 7.3.2","models/clm45","Roxygen",FALSE
"roxygen2","== 7.3.2","models/dalec","Roxygen",FALSE
"roxygen2","== 7.3.2","models/dvmdostem","Roxygen",FALSE
"roxygen2","== 7.3.2","models/ed","Roxygen",FALSE
"roxygen2","== 7.3.2","models/fates","Roxygen",FALSE
"roxygen2","== 7.3.2","models/gday","Roxygen",FALSE
"roxygen2","== 7.3.2","models/jules","Roxygen",FALSE
"roxygen2","== 7.3.2","models/ldndc","Roxygen",FALSE
"roxygen2","== 7.3.2","models/linkages","Roxygen",FALSE
"roxygen2","== 7.3.2","models/lpjguess","Roxygen",FALSE
"roxygen2","== 7.3.2","models/maat","Roxygen",FALSE
"roxygen2","== 7.3.2","models/maespa","Roxygen",FALSE
"roxygen2","== 7.3.2","models/preles","Roxygen",FALSE
"roxygen2","== 7.3.2","models/sibcasa","Roxygen",FALSE
"roxygen2","== 7.3.2","models/sipnet","Roxygen",FALSE
"roxygen2","== 7.3.2","models/stics","Roxygen",FALSE
"roxygen2","== 7.3.2","models/template","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/allometry","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/assim.batch","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/assim.sequential","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/benchmark","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/data.atmosphere","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/data.land","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/data.remote","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/emulator","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/meta.analysis","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/photosynthesis","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/priors","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/rtm","Roxygen",FALSE
"roxygen2","== 7.3.2","modules/uncertainty","Roxygen",FALSE
"RPostgres","*","base/db","Suggests",FALSE
"RPostgreSQL","*","base/db","Suggests",FALSE
"RPostgreSQL","*","models/biocro","Suggests",FALSE
Expand Down
2 changes: 1 addition & 1 deletion models/basgra/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/biocro/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ Copyright: Energy Biosciences Institute, Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/cable/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/clm45/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/dalec/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/dvmdostem/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/ed/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ Copyright: Authors
LazyLoad: yes
LazyData: true
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
Config/testthat/edition: 2
2 changes: 1 addition & 1 deletion models/fates/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/gday/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: TRUE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/jules/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/ldndc/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/linkages/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/lpjguess/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/maat/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/maespa/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ LazyLoad: yes
LazyData: FALSE
Require:
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/preles/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/sibcasa/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ License: BSD_3_clause + file LICENSE
Copyright: Authors
LazyData: TRUE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/sipnet/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
Require:
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/stics/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion models/template/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/allometry/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
VignetteBuilder: knitr
2 changes: 1 addition & 1 deletion modules/assim.batch/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
2 changes: 1 addition & 1 deletion modules/assim.sequential/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ Suggests:
License: BSD_3_clause + file LICENSE
Copyright: Authors
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/benchmark/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/data.atmosphere/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/data.land/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ License: BSD_3_clause + file LICENSE
Copyright: Authors
LazyData: true
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/data.remote/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/emulator/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Description: Implementation of a Gaussian Process model (both likelihood and
for sampling design and prediction.
License: BSD_3_clause + file LICENSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/meta.analysis/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ VignetteBuilder: knitr
Copyright: Authors
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
2 changes: 1 addition & 1 deletion modules/photosynthesis/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ Collate:
Licor.QC.R
plots.R
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
VignetteBuilder: knitr
2 changes: 1 addition & 1 deletion modules/priors/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Suggests:
PEcAn.visualization,
testthat
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/rtm/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ LazyData: FALSE
Encoding: UTF-8
VignetteBuilder: knitr
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion modules/uncertainty/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ Copyright: Authors
LazyLoad: yes
LazyData: FALSE
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2

0 comments on commit e53481c

Please sign in to comment.