Merge branch 'master' into dev

.github/workflows/pkgdown.yaml

@@ -46,7 +46,7 @@ jobs:
           test "$CI_COMMIT_BRANCH" -eq "master" && PKGDOWN_DEV_MODE="release" || PKGDOWN_DEV_MODE="devel"
 
       - name: Build site
-        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
+        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE, run_dont_run = TRUE)
         shell: Rscript {0}
 
       - name: Deploy to GitHub pages 🚀

.github/workflows/rhub.yaml

+# R-hub's generic GitHub Actions workflow file. It's canonical location is at
+# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml
+# You can update this file to a newer version using the rhub2 package:
+#
+# rhub::rhub_setup()
+#
+# It is unlikely that you need to modify this file manually.
+
+name: R-hub
+run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}"
+
+on:
+  workflow_dispatch:
+    inputs:
+      config:
+        description: 'A comma separated list of R-hub platforms to use.'
+        type: string
+        default: 'linux,windows,macos'
+      name:
+        description: 'Run name. You can leave this empty now.'
+        type: string
+      id:
+        description: 'Unique ID. You can leave this empty now.'
+        type: string
+
+jobs:
+
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      containers: ${{ steps.rhub-setup.outputs.containers }}
+      platforms: ${{ steps.rhub-setup.outputs.platforms }}
+
+    steps:
+    # NO NEED TO CHECKOUT HERE
+    - uses: r-hub/actions/setup@v1
+      with:
+        config: ${{ github.event.inputs.config }}
+      id: rhub-setup
+
+  linux-containers:
+    needs: setup
+    if: ${{ needs.setup.outputs.containers != '[]' }}
+    runs-on: ubuntu-latest
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.containers) }}
+    container:
+      image: ${{ matrix.config.container }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+
+  other-platforms:
+    needs: setup
+    if: ${{ needs.setup.outputs.platforms != '[]' }}
+    runs-on: ${{ matrix.config.os }}
+    name: ${{ matrix.config.label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config: ${{ fromJson(needs.setup.outputs.platforms) }}
+
+    steps:
+      - uses: r-hub/actions/checkout@v1
+      - uses: r-hub/actions/setup-r@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/platform-info@v1
+        with:
+          token: ${{ secrets.RHUB_TOKEN }}
+          job-config: ${{ matrix.config.job-config }}
+      - uses: r-hub/actions/setup-deps@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}
+      - uses: r-hub/actions/run-check@v1
+        with:
+          job-config: ${{ matrix.config.job-config }}
+          token: ${{ secrets.RHUB_TOKEN }}

.gitlab-ci.yml

@@ -27,7 +27,6 @@ test_all:
 
 run_examples:
   stage: checks
-  allow_failure: true
   script:
   - R -q -e 'options(error = function() quit(save = "no", status = 1)); devtools::run_examples(run_donttest = TRUE, run_dontrun = TRUE)'
 

DESCRIPTION

 Package: airGRiwrm
 Title: 'airGR' Integrated Water Resource Management
-Version: 0.7.0
-Date: 2024-08-01
+Version: 0.7.0.9000
+Date: 2024-09-22
 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.7.0
 
 Breaking changes:
@@ -33,6 +35,7 @@ New features:
 * Feature request: function for getting parameters from `GRiwrmOutputsCalib` (#86)
 * Speed up RunModel_Lag for RunModel.Supervisor (#164)
 * plot.GRiwrm: allow to use optional parameters of `mermaid` function (#160)
+* Ungauged node cluster: improve outsider gauged node detection (#168)
 
 Bug fixes:
 ----------
@@ -70,6 +73,7 @@ Bug fixes:
 * plot.GRiwrm crashes with a single node (#153)
 * CreateInputsModel: Don't allow ungauged donor (#131)
 * Rename internal function `RunModel.SD` (#166)
+* Calibration: crash with downstream receiver node with upstream reservoir (#167)
 
 Documentation:
 --------------

README.Rmd

@@ -35,6 +35,9 @@ devtools::install_github("inrae/airGRiwrm", "dev")
 Visit the website dedicated to the package at https://inrae.github.io/airGRiwrm/
 for tutorials, usage examples and documentation.
 
+[Subscribe to the airGRiwrm users mailing list](https://groupes.renater.fr/sympa/subscribe/airgriwrm-users)
+to be kept informed of updates and to ask for help from other users of the software.
+
 ## Acknowledgement
 
 This package has been developped as part of the IN-WOP European project (2019-2023) and

README.md

@@ -41,6 +41,11 @@ Visit the website dedicated to the package at
 <https://inrae.github.io/airGRiwrm/> for tutorials, usage examples and
 documentation.
 
+[Subscribe to the airGRiwrm users mailing
+list](https://groupes.renater.fr/sympa/subscribe/airgriwrm-users) to be
+kept informed of updates and to ask for help from other users of the
+software.
+
 ## Acknowledgement
 
 This package has been developped as part of the IN-WOP European project

_pkgdown.yml

 url: https://inrae.github.io/airGRiwrm
 development:
-  mode: auto
+  mode: devel
 
 template:
   params:

dev/dev_checks_for_cran.R

 # Copied from https://github.com/ThinkR-open/prepare-for-cran
 # Prepare for CRAN ----
 
+# * Merge branch from dev to master
+
 # Update dependencies in DESCRIPTION
 # install.packages('attachment', repos = 'https://thinkr-open.r-universe.dev')
 attachment::att_amend_desc()
 
 # Check package coverage
+remotes::update_packages("covr")
 covr::package_coverage()
 covr::report()
 
@@ -89,6 +92,15 @@ usethis::use_cran_comments(open = rlang::is_interactive())
 
 # Upgrade version number
 usethis::use_version(which = c("patch", "minor", "major", "dev")[1])
+# * Pass _pkgdown.yml > development > mode to "release"
 
 # Verify you're ready for release, and release
 devtools::release()
+
+# After the acceptation on CRAN
+# * Create the release on gitlab
+# * Create the release on github
+# * Upgrade version to dev x.y.z.9000
+usethis::use_version(which = c("patch", "minor", "major", "dev")[4])
+# * Pass _pkgdown.yml > development > mode to "devel"
+# * Merge branch from master to dev

inst/WORDLIST

@@ -153,13 +153,13 @@ getSD
 github
 gitlab
 hal
-herited
 hess
 https
 hydrograph
 hydrological
 hydrologique
 hydrologiques
+hydrometric
 impoundments
 inrae
 lfloor