diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
index 1865a963004d30bee1f5aa55add5c8fb345afdc5..b5edc3b4579b7abc9ea5a5cca189f00eb948d122 100644
--- a/.github/workflows/pkgdown.yaml
+++ b/.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 🚀
diff --git a/.github/workflows/rhub.yaml b/.github/workflows/rhub.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..74ec7b051aae5ed0f3de7e07fa53d08ee9ea0632
--- /dev/null
+++ b/.github/workflows/rhub.yaml
@@ -0,0 +1,95 @@
+# 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 }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a70f3cc3cda5665fbe97eee0e44fa98c61e28ac..01e9c9d50cf32a16eaa5651f0e73d0ff64d6cbc8 100644
--- a/.gitlab-ci.yml
+++ b/.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)'
diff --git a/DESCRIPTION b/DESCRIPTION
index 8209d9a08b7d97a1005c8780a81a0d6f27a006c1..012fe8f1f35183d37b544c46dc0351aeab3281ab 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
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")),
diff --git a/NEWS.md b/NEWS.md
index a775958b00f9c0e3a10b069fc162999697f0a873..80ced8fd566f462fb84a6f479c092d7fd03c8444 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,5 @@
+# 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:
--------------
diff --git a/README.Rmd b/README.Rmd
index 578fd17a98d7d1641a83d70b4cc7ba658a167181..a6e5bda30b95932b2bd42571f930366ce36e9d9f 100644
--- a/README.Rmd
+++ b/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
diff --git a/README.md b/README.md
index 3bae2b66727268f42e158185d2b7fb7030cfa797..658db4c73086e2b34ed95f3c45cb47b863e4674a 100644
--- a/README.md
+++ b/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
diff --git a/_pkgdown.yml b/_pkgdown.yml
index 35256eec6875aef98d755f88c870718a7743ce93..68d4735cb3a15b6ed4905f29b836bf1a7532c7d5 100644
--- a/_pkgdown.yml
+++ b/_pkgdown.yml
@@ -1,6 +1,6 @@
url: https://inrae.github.io/airGRiwrm
development:
- mode: auto
+ mode: devel
template:
params:
diff --git a/dev/dev_checks_for_cran.R b/dev/dev_checks_for_cran.R
index 76719ce8ed89e497e9c8506543e6ca835bd1b764..e62488f1ab1c000d1c22a1dc3ae45d9bb254a6a9 100644
--- a/dev/dev_checks_for_cran.R
+++ b/dev/dev_checks_for_cran.R
@@ -1,11 +1,14 @@
# 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
diff --git a/inst/WORDLIST b/inst/WORDLIST
index ac2c53fc574bf5e47abda333a5d290a170a9ca79..d2644fc932f9fd42ad0512b8fba1a3d9ec226bf8 100644
--- a/inst/WORDLIST
+++ b/inst/WORDLIST
@@ -153,13 +153,13 @@ getSD
github
gitlab
hal
-herited
hess
https
hydrograph
hydrological
hydrologique
hydrologiques
+hydrometric
impoundments
inrae
lfloor