Merge branch '140-release-v0-6-2' into 'master'

Resolve "Release v0.6.2"

See merge request !70

.devcontainer/devcontainer.json

 {
-	"image": "rocker/geospatial:devel",
+	"image": "rocker/verse:devel",
 	"customizations": {
 		"vscode": {
 			"extensions": [
@@ -9,6 +9,6 @@
 		}
 	},
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "R -q -e 'options(repos = c(CRAN = \"https://packagemanager.posit.co/cran/__linux__/focal/latest\"));install.packages(\"languageserver\");remotes::install_deps(dep = TRUE)'",
+	"postCreateCommand": "R -q -e 'options(repos = c(CRAN = \"https://packagemanager.posit.co/cran/__linux__/jammy/latest\"));remotes::update_packages(\"languageserver\");remotes::install_deps(dep = TRUE)'",
 	"postStartCommand": "R -q -e 'devtools::install()'"
 }

.gitlab-ci.yml

@@ -32,9 +32,9 @@ check:
       - tags
       - schedules
   script:
-  - tlmgr update --self && tlmgr install ec epstopdf-pkg
+  - tlmgr update --self && tlmgr install ec epstopdf-pkg amsmath
   - R -q -e 'remotes::update_packages("rcmdcheck")'
-  - R -q -e 'rcmdcheck::rcmdcheck(args = "--as-cran", error_on = "warning")'
+  - R -q -e 'options(error = function() quit(save = "no", status = 1)); rcmdcheck::rcmdcheck(args = "--as-cran", error_on = "warning")'
 
 website:
   stage: publish

CRAN-SUBMISSION

-Version: 0.6.1
-Date: 2022-03-03 15:55:42 UTC
-SHA: 2c19e5a599a313ae26ff033fa2b96e7a89adb561
+Version: 0.6.2
+Date: 2023-10-24 14:00:48 UTC
+SHA: 60909d8a8f32038752b28acc2556a5aae3ca84ab

DESCRIPTION

 Package: airGRiwrm
 Title: 'airGR' Integrated Water Resource Management
-Version: 0.6.1.9000
-Date: 2022-03-03
+Version: 0.6.2
+Date: 2022-10-24
 Authors@R: c(
     person("David", "Dorchies", , "david.dorchies@inrae.fr", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-6595-7984")),

NEWS.md

-# airGRiwrm (development version)
+# airGRiwrm 0.6.2
 
-airGRiwrm 0.6.1
-===============
+
+Internal changes:
+-----------------
+
+* airGR changes cause failed check (#139)
+
+
+# airGRiwrm 0.6.1
 
 Changes:
 --------
@@ -60,8 +66,7 @@ Internal changes:
 * Automatically update website from package repository (#47)
 
 
-airGRiwrm 0.5.0 (Release date: 2021-03-07)
-==========
+# airGRiwrm 0.5.0 (Release date: 2021-03-07)
 
 New features:
 -------------
@@ -76,8 +81,7 @@ Changes:
 * RunModel: Uncoupling of hydrological and hydraulic models (#28)
 
 
-airGRiwrm 0.4.0 (Release date: 2020-12-28)
-==========
+# airGRiwrm 0.4.0 (Release date: 2020-12-28)
 
 New features:
 -------------
@@ -101,8 +105,7 @@ Bug fixes:
 * Error in the area used for the sub basins (#22)
 
 
-airGRiwrm 0.3.1 (Release date: 2020-08-07)
-==========
+# airGRiwrm 0.3.1 (Release date: 2020-08-07)
 
 New features:
 -------------
@@ -110,8 +113,7 @@ New features:
 * Calibration of influenced semi-distributed model (#11)
 
 
-airGRiwrm 0.3.0 (Release date: 2020-08-07)
-==========
+# airGRiwrm 0.3.0 (Release date: 2020-08-07)
 
 New features:
 -------------
@@ -119,8 +121,7 @@ New features:
 * Add node of type "direct flow" in order to inject or withdraw flows into the model (#5)
 
 
-airGRiwrm 0.2.1 (Release date: 2020-06-11)
-==========
+# airGRiwrm 0.2.1 (Release date: 2020-06-11)
 
 Changes:
 --------
@@ -130,8 +131,7 @@ Changes:
 * Rename "Ginet" class object to "Griwrm" (#10)
 
 
-airGRiwrm 0.2.0 (Release date: 2020-06-06)
-==========
+# airGRiwrm 0.2.0 (Release date: 2020-06-06)
 
 New features:
 -------------
@@ -139,8 +139,7 @@ New features:
 * Calibration of semi-distributed model (#3)
 
 
-airGRiwrm 0.1.0 (Release date: 2020-05-25)
-==========
+# airGRiwrm 0.1.0 (Release date: 2020-05-25)
 
 New features:
 -------------

cran-comments.md

@@ -2,67 +2,4 @@
 
 0 errors | 0 warnings | 0 note
 
-## Context
-
-This is a second submission for a first version to publish on CRAN. Here's below the mail of submission refusal: 
-
-Date : 	Thu, 3 Mar 2022 10:11:56 +0100
-From : 	Gregor Seyer <gregor.seyer@wu.ac.at>
-
-Thanks,
-
-Please add \value to .Rd files regarding exported methods and explain the functions results in the documentation. Please write about the structure of the output (class) and also what the output means. (If a function does not return a value, please document that too, e.g. \value{No return value, called for side effects} or similar)
-
-Missing Rd-tags:
-
-     plot.Qm3s.Rd: \value
-     RunModel.InputsModel.Rd: \value
-
-Please make sure that you do not change the user's options, par or working directory. If you really have to do so within functions, please ensure with an *immediate* call of on.exit() that the settings are reset when the function is exited. e.g.:
-
-```
-...
-oldpar <- par(no.readonly = TRUE)    # code line i
-on.exit(par(oldpar))            # code line i + 1
-...
-par(mfrow=c(2,2))            # somewhere after
-...
-```
-
-e.g.: plot.GRiwrmOutputsModel.R
-
-If you're not familiar with the function, please check ?on.exit. This function makes it possible to restore options before exiting a function even if the function breaks. Therefore it needs to be called immediately after the option change within a function.
-
-Please always make sure to reset to user's options(), working directory or par() after you changed it in examples and vignettes and demos.
-
-e.g.: inst/doc/V04_Closed-loop_regulated_withdrawal.R
-
-```
-oldpar <- par(mfrow = c(1,2))
-...
-par(oldpar)
-```
-
-
-Please fix and resubmit.
-
-Best,
-Gregor Seyer
-
-## What have been done since?
-
-### `value` tag issues
-
-* I have added `value` tags to plot.Qm3s.Rd and RunModel.InputsModel.Rd. I have also completed the `value` tags of RunModel.GRiwrmInputsModel.Rd and plot.GRiwrmOutputsModel.Rd for more precision.
-
-### User's options issues
-
-* plot.GRiwrmOutputsModel.R and V04_Closed-loop_regulated_withdrawal.R have been modified accordingly to the advice above.
-
-### Miscellaneous
-
-* A small bug (https://gitlab.irstea.fr/in-wop/airGRiwrm/-/issues/75) has been fixed in a vignette
-* A small new feature has been implemented on plot.Qm3s (https://gitlab.irstea.fr/in-wop/airGRiwrm/-/issues/76)
-* DESCRIPTION and NEWS.md have been updated for taking into account version upgrade.
-
-**Thanks for all :)**
+* This is a very small patch only containing changes in tests for preparing the upcoming release of airGR.

dev/dev_checks_for_cran.R

+# This script is directly copied from https://github.com/ThinkR-open/prepare-for-cran
+
 # Prepare for CRAN ----
-# @source https://github.com/ThinkR-open/prepare-for-cran
 
 # Update dependencies in DESCRIPTION
 attachment::att_amend_desc()
@@ -61,3 +62,8 @@ usethis::use_version(which = c("patch", "minor", "major", "dev")[1])
 
 # Verify you're ready for release, and release
 devtools::release()
+
+# After the acceptation on CRAN
+# * Create the release on github
+# * Upgrade version to dev x.y.z.9000
+usethis::use_version(which = c("patch", "minor", "major", "dev")[4])

inst/WORDLIST

+AGPL
 ANR
 ASB
 Acknowledgement
@@ -10,6 +11,7 @@ BasinsInfo
 Bewdley
 Buildwas
 CHAUM
+CVD
 CalibOptions
 CemaNeige
 Centre
@@ -22,7 +24,9 @@ CreateGRiwrm
 CreateInputsCrit
 CreateInputsModel
 CreateRunOptions
+DOI
 De
+Dev
 DiagrammeR
 EAU
 EFI
@@ -39,7 +43,6 @@ GRiwrmOutputsModel
 GRiwrmRunOptions
 Ginet
 Girop
-Gitlab
 GriwmRunOptions
 Griwrm
 HTMLwidget
@@ -53,7 +56,6 @@ IniStates
 InputsCrit
 InputsModel
 Ip
-Irstea
 JPI
 KGE
 Lavenne
@@ -88,6 +90,7 @@ airGR
 airgr
 al
 anthropized
+ci
 ctrlr
 decile
 dev
@@ -95,13 +98,11 @@ et
 evapotranspiration
 frac
 github
+gitlab
 grey
 hydrological
 impoundments
-irrigations
 lfloor
-modelled
-optimises
 pkgdown
 priori
 rfloor