Merge pull request #228 from r-spatial/maintenance

Maintenance

Author: florisvdh

.github/workflows/R-CMD-check.yaml

@@ -24,17 +24,17 @@ jobs:
           - {os: windows-latest, qgis: 'none', r: 'oldrel', dep: '', r-pkg-cache: 'v0'}
           - {os: windows-latest, qgis: 'none', r: 'release', dep: '', r-pkg-cache: 'v0'}
           - {os: windows-latest, qgis: 'none', r: 'devel', dep: '', r-pkg-cache: 'v0'}
-          - {os: ubuntu-22.04, qgis: 'none', r: 'release', dep: '', r-pkg-cache: 'v0'}
+          - {os: ubuntu-24.04, qgis: 'none', r: 'release', dep: '', r-pkg-cache: 'v0'}
           - {os: macOS-latest, qgis: 'macos-brew', r: 'release', dep: '', r-pkg-cache: 'v0'}
           - {os: windows-latest, qgis: 'chocolatey', r: 'release', dep: '', r-pkg-cache: 'v0'}
           - {os: windows-latest, qgis: 'chocolatey-ltr', r: 'release', dep: '', r-pkg-cache: 'v0'}
           - {os: windows-latest, qgis: 'chocolatey', r: 'devel', dep: '', r-pkg-cache: 'v0'}
-          - {os: ubuntu-22.04, qgis: 'ubuntu-nightly', r: 'release', dep: '', r-pkg-cache: 'v0'}
-          - {os: ubuntu-22.04, qgis: 'ubuntu-nightly', r: 'devel', dep: '', r-pkg-cache: 'v0'}
-          - {os: ubuntu-22.04, qgis: 'ubuntugis', r: 'release', dep: '', r-pkg-cache: 'v1'}
-          - {os: ubuntu-22.04, qgis: 'ubuntu', r: 'release', dep: '', r-pkg-cache: 'v0'}
-          - {os: ubuntu-22.04, qgis: 'ubuntu', r: 'release', dep: ' [hard-deps]', r-pkg-cache: 'v3'}
-          - {os: ubuntu-22.04, qgis: 'ubuntu-ltr', r: 'release', dep: '', r-pkg-cache: 'v0'}
+          - {os: ubuntu-24.04, qgis: 'ubuntu-nightly', r: 'release', dep: '', r-pkg-cache: 'v0'}
+          - {os: ubuntu-24.04, qgis: 'ubuntu-nightly', r: 'devel', dep: '', r-pkg-cache: 'v0'}
+          - {os: ubuntu-24.04, qgis: 'ubuntugis', r: 'release', dep: '', r-pkg-cache: 'v1'}
+          - {os: ubuntu-24.04, qgis: 'ubuntu', r: 'release', dep: '', r-pkg-cache: 'v0'}
+          - {os: ubuntu-24.04, qgis: 'ubuntu', r: 'release', dep: ' [hard-deps]', r-pkg-cache: 'v3'}
+          - {os: ubuntu-24.04, qgis: 'ubuntu-ltr', r: 'release', dep: '', r-pkg-cache: 'v0'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -50,7 +50,7 @@ jobs:
         with:
           r-version: ${{ matrix.config.r }}
           use-public-rspm: true
-          extra-repositories: https://geocompr.r-universe.dev
+          extra-repositories: https://geocompx.r-universe.dev
 
       - name: Prepare Ubuntu for installing QGIS (common code)
         if: runner.os == 'Linux' && matrix.config.qgis != 'none'
@@ -92,12 +92,12 @@ jobs:
           # Add repo to install QGIS LTR (long-term release) for Ubuntu (using an often outdated GRASS release from Ubuntu repo)
           sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr `lsb_release -c -s` main" > /etc/apt/sources.list.d/qgis.list'
 
-      - name: Install QGIS, GRASS, SAGA and the SAGA NextGen plugin (Ubuntu) from preset repos
+      - name: Install QGIS, GRASS GIS, SAGA and the SAGA NextGen plugin (Ubuntu) from preset repos
         if: runner.os == 'Linux' && matrix.config.qgis != 'none'
         run: |
-          # Install QGIS, GRASS, SAGA and the SAGA NextGen plugin (Ubuntu) from preset repos
+          # Install QGIS, GRASS GIS, SAGA and the SAGA NextGen plugin (Ubuntu) from preset repos
           sudo apt-get update
-          sudo apt-get install -y qgis qgis-plugin-grass saga
+          sudo apt-get install -y qgis grass-core saga
           wget -qO ../sagang_plugin.zip https://plugins.qgis.org/plugins/processing_saga_nextgen/version/$SAGANGV/download/
           unzip -q ../sagang_plugin.zip -d ../extra_plugins
 

.github/workflows/pkgdown.yaml

@@ -9,7 +9,7 @@ name: pkgdown
 
 jobs:
   pkgdown:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       SAGANGV: 0.0.7
@@ -21,7 +21,7 @@ jobs:
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
-          extra-repositories: https://geocompr.r-universe.dev
+          extra-repositories: https://geocompx.r-universe.dev
 
       - name: Dynamically set QGIS_PLUGINPATH environment var (available to next steps)
         run: |

DESCRIPTION

@@ -30,7 +30,7 @@ License: GPL (>= 3)
 URL: https://r-spatial.github.io/qgisprocess/,
     https://github.com/r-spatial/qgisprocess
 BugReports: https://github.com/r-spatial/qgisprocess/issues
-Depends: R (>= 3.6.0)
+Depends: R (>= 4.1.0)
 Imports: 
     assertthat,
     glue,
@@ -59,13 +59,13 @@ Suggests:
     tidyr
 VignetteBuilder: 
     knitr
-Additional_repositories: https://geocompr.r-universe.dev
+Additional_repositories: https://geocompx.r-universe.dev
 Config/checklist/communities: inbo
 Config/checklist/keywords: R; package; QGIS
 Encoding: UTF-8
 Language: en-GB
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 SystemRequirements: 'QGIS' latest or long-term release currently supported
     according to the 'QGIS' release schedule
     (<https://www.qgis.org/en/site/getinvolved/development/roadmap.html>). Older

R/qgis-state.R

@@ -382,7 +382,13 @@ readopt_json_output <- function() {
 
 
 
-
+#' Return the value of an option and read an environment variable as fallback
+#'
+#' @param option_name The name of the option.
+#' @param envvar_name The name of the environment variable.
+#'
+#' @noRd
+#'
 #' @keywords internal
 readopt <- function(option_name, envvar_name) {
   getOption(
@@ -398,7 +404,7 @@ readopt <- function(option_name, envvar_name) {
 
 #' Resolve a boolean option or environment variable to TRUE, FALSE or (optionally) NA
 #'
-#' @param value A result as obtained by [readopt()].
+#' @param value A result as obtained by `readopt()`.
 #' @param keep_NA Return NA if option and env var are empty?
 #' (i.e. `NULL` and `""` respectively).
 #' The default (`FALSE`) will return `FALSE`.