Merge branch 'main' into develop

README.md

@@ -5,7 +5,7 @@ state and is being actively
 developed.](http://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/)
 [![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/gsw)](https://cran.r-project.org/package=gsw)
 [![R-CMD-check](https://github.com/TEOS-10/GSW-R/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/TEOS-10/GSW-R/actions/workflows/R-CMD-check.yaml)
-[![R-hub](https://github.com/dankelley/GSW-R/actions/workflows/rhub.yaml/badge.svg)](https://github.com/dankelley/GSW-R/actions/workflows/rhub.yaml)
+[![R-hub](https://github.com/TEOS-10/GSW-R/actions/workflows/rhub.yaml/badge.svg)](https://github.com/TEOS-10/GSW-R/actions/workflows/rhub.yaml)
 ![RStudio CRAN mirror downloads](https://cranlogs.r-pkg.org/badges/last-month/gsw)
 ![RStudio CRAN mirror downloads](https://cranlogs.r-pkg.org/badges/last-week/gsw)
 ![RStudio CRAN mirror downloads](https://cranlogs.r-pkg.org/badges/last-day/gsw)

_pkgdown.yml

@@ -1 +1,4 @@
-url: http://teos-10.github.io/GSW-R
+url: http://teos-10.github.io/GSW-R/
+template:
+  bootstrap: 5
+

check_package.R

@@ -17,8 +17,8 @@ devtools::check_win_oldrelease()
 
 # 2024-08-19 DEK: rhub has been replaced by rhub2, so the following no longer
 # work. The new system is complicated, and has the disadvantage that it only
-# works on code that has been pushed to github ... so I will just use a github
-# action instead, I think.
+# works on code that has been pushed to github ... so now we rely on github
+# actions.
 #    rhub::check_for_cran(email = "Dan.Kelley@Dal.Ca", show_status = FALSE)
 #    rhub::check(platform = "debian-clang-devel", show_status = FALSE)
 remotes::install_github("r-lib/revdepcheck")

codemeta.json

@@ -118,11 +118,11 @@
     },
     "SystemRequirements": null
   },
-  "fileSize": "5171.563KB",
+  "fileSize": "5165.753KB",
   "relatedLink": ["http://teos-10.github.io/GSW-R/", "https://CRAN.R-project.org/package=gsw"],
   "releaseNotes": "https://github.com/TEOS-10/GSW-R/blob/master/NEWS.md",
   "readme": "https://github.com/TEOS-10/GSW-R/blob/main/README.md",
-  "contIntegration": "https://github.com/TEOS-10/GSW-R/actions/workflows/R-CMD-check.yaml",
+  "contIntegration": ["https://github.com/TEOS-10/GSW-R/actions/workflows/R-CMD-check.yaml", "https://github.com/dankelley/GSW-R/actions/workflows/rhub.yaml"],
   "developmentStatus": "https://www.repostatus.org/",
   "keywords": ["seawater", "gibbs", "teos-10", "oceanography"]
 }

cran-comments.md

@@ -1,7 +1,10 @@
 # Submission of 1.2-0
 
 This update was required by 2024-09-20, in order to accommodate the change from
-the Calloc() and Free() macros to R_Calloc() and R_Free().
+the Calloc() and Free() macros to R_Calloc() and R_Free(). The only other
+change from the previous CRAN version is the addition of the function
+`gsw_infunnel()`, and this addition does not affect any previous behaviours of
+the package.
 
 # Tests
 
@@ -18,8 +21,4 @@ package.
 ## Remote tests
 
 * No problems on win-builder (devel and release).
-
-# No problems on Github R-CMD-check action tests.
-
-
-
+* No problems on Github R-CMD-check action tests.

vignettes/gsw.Rmd

@@ -20,8 +20,8 @@ vignette: >
 
 **Abstract.** The `gsw` package provides an R implementation of the Gibbs
 SeaWater toolbox for the calculation of seawater properties, based on the GSW-C
-framework^[This version of GSW-R is based on GSW-C as it existed on 2021-07-06
-in github commit 9c10670e89fce906da2cebce3399d73c054e769e; see
+framework^[This version of GSW-R is based on GSW-C release 3.06-16-0, commit
+'657216dd4f5ea079b5f0e021a4163e2d26893371', dated 2022-10-11; see
 <https://github.com/TEOS-10/GSW-C>.].  This vignette outlines how to use `gsw`
 alone or as part of the `oce` package [@kelley_oce_2021].