From 7af6e5bad766d2d67a4a93c1ef1cab34453be9b4 Mon Sep 17 00:00:00 2001 From: "Adam B. Smith" Date: Mon, 9 Dec 2024 12:12:49 -0600 Subject: [PATCH 1/3] Update R-CMD-check.yaml --- .github/workflows/R-CMD-check.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 1bb84bae..cf5d0259 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -35,6 +35,10 @@ jobs: r-version: ${{ matrix.config.r }} use-public-rspm: true + - name: Install XQuartz on macOS + if: runner.os == 'macOS' + run: brew install xquartz --cask + - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: any::rcmdcheck From 88401ba02ed8d74f638816396fec2924eb76b78d Mon Sep 17 00:00:00 2001 From: "Adam B. Smith" Date: Mon, 9 Dec 2024 12:13:00 -0600 Subject: [PATCH 2/3] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bb52ea8e..519d8871 100644 --- a/README.md +++ b/README.md @@ -21,13 +21,13 @@ Faster raster processing in `R` using `GRASS GIS` `fasterRaster` makes heavy use of the `rgrass` package by Roger Bivand and others, the `terra` package by Robert Hijmans, the `sf` package by Edzer Pebesma, Roger Bivand, and others, and of course `GRASS GIS`, so is greatly indebted to all of these creators! # Vignettes & documentation -**fasterRaster** comes with four user-oriented vignettes: +**fasterRaster** comes with four user-oriented vignettes, plus a `pkgdown` site with full documentation: -o Getting started (also reproduced below) -o Types of `GRaster`s -o Making **fasterRaster** faster -o Addons -o Documentation +o Getting started (also reproduced below) +o Types of `GRaster`s +o Making **fasterRaster** faster +o Addons +o Documentation # Installation To install `fasterRaster`, please use: From 41c42e7c0dcae056a0c1584ce3b1dacaf3cd38f9 Mon Sep 17 00:00:00 2001 From: "Adam B. Smith" Date: Mon, 9 Dec 2024 15:54:34 -0600 Subject: [PATCH 3/3] Comment our ubuntu CMD check; fix CRAN pretest issue --- .github/workflows/R-CMD-check.yaml | 4 ++-- R/datatype.r | 2 +- inst/pkgdown.yml | 2 +- man/datatype.Rd | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index cf5d0259..a4cb7c3f 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -21,8 +21,8 @@ jobs: - {os: windows-latest, r: 'release'} - {os: windows-latest, r: 'devel'} - {os: macOS-latest, r: 'release'} - - {os: ubuntu-latest, r: 'devel'} - - {os: ubuntu-latest, r: 'release'} + # - {os: ubuntu-latest, r: 'devel'} + # - {os: ubuntu-latest, r: 'release'} env: RSPM: ${{ matrix.config.rspm }} GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} diff --git a/R/datatype.r b/R/datatype.r index 043edac3..e0bbd64c 100644 --- a/R/datatype.r +++ b/R/datatype.r @@ -7,7 +7,7 @@ #' * `"fasterRaster"` (default): Reports the **fasterRaster** type (factor, integer, float, or double) #' * `"terra"`: Report the (inferred) **terra** data type (e.g., INT2U, FLT4S). Please see the table in the documentation for [writeRaster()` for an explanation of these codes. #' * `"GRASS"`: Will return "CELL" (integer), "FCELL" (floating-point value), or "DCELL" (double-floating point value) -#' * `"GDAL"`: See [GDAL: Raster Band](https://gdal.org/user/raster_data_model.html). Please also see the table in the [writeRaster()] help page. +#' * `"GDAL"`: See [GDAL: Raster Band](https://gdal.org/en/stable/user/raster_data_model.html). Please also see the table in the [writeRaster()] help page. #' #' @param forceDouble Logical (`GRaster`s and `SpatRaster`s only): If `TRUE` (default), and the raster appears to represent non-integer values, then the raster will be assumed to represent double-floating point values (**GRASS**: type "DCELL", **terra**: type "FLT8S", **fasterRaster**: type "double", and **GDAL**: type "Float64"). `forceDouble` reports the actual datatype if `type = "fasterRaster"` (i.e., the type is not forced to "double"). #' diff --git a/inst/pkgdown.yml b/inst/pkgdown.yml index 68ca83fa..48f1ad76 100644 --- a/inst/pkgdown.yml +++ b/inst/pkgdown.yml @@ -9,7 +9,7 @@ articles: hidden_functions: hidden_functions.html projects_mapsets: projects_mapsets.html regions: regions.html -last_built: 2024-12-09T17:02Z +last_built: 2024-12-09T21:39Z urls: reference: https://github.com/adamlilith/fasterRaster/reference article: https://github.com/adamlilith/fasterRaster/articles diff --git a/man/datatype.Rd b/man/datatype.Rd index ca0e4bb5..cb74b0e3 100644 --- a/man/datatype.Rd +++ b/man/datatype.Rd @@ -18,7 +18,7 @@ \item \code{"fasterRaster"} (default): Reports the \strong{fasterRaster} type (factor, integer, float, or double) \item \code{"terra"}: Report the (inferred) \strong{terra} data type (e.g., INT2U, FLT4S). Please see the table in the documentation for [writeRaster()` for an explanation of these codes. \item \code{"GRASS"}: Will return "CELL" (integer), "FCELL" (floating-point value), or "DCELL" (double-floating point value) -\item \code{"GDAL"}: See \href{https://gdal.org/user/raster_data_model.html}{GDAL: Raster Band}. Please also see the table in the \code{\link[=writeRaster]{writeRaster()}} help page. +\item \code{"GDAL"}: See \href{https://gdal.org/en/stable/user/raster_data_model.html}{GDAL: Raster Band}. Please also see the table in the \code{\link[=writeRaster]{writeRaster()}} help page. }} \item{forceDouble}{Logical (\code{GRaster}s and \code{SpatRaster}s only): If \code{TRUE} (default), and the raster appears to represent non-integer values, then the raster will be assumed to represent double-floating point values (\strong{GRASS}: type "DCELL", \strong{terra}: type "FLT8S", \strong{fasterRaster}: type "double", and \strong{GDAL}: type "Float64"). \code{forceDouble} reports the actual datatype if \code{type = "fasterRaster"} (i.e., the type is not forced to "double").}