From eadefe2ca233046ead1c8c9a5c69f69b2df48231 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 17 Oct 2022 15:27:49 -0300 Subject: [PATCH 1/9] update footnote --- vignettes/gsw.Rmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vignettes/gsw.Rmd b/vignettes/gsw.Rmd index edbe39a3..983a208e 100644 --- a/vignettes/gsw.Rmd +++ b/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 .]. This vignette outlines how to use `gsw` alone or as part of the `oce` package [@kelley_oce_2021]. From 42c0965f5e841e3f826fc413b70dc3948a5cdfa9 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 17 Oct 2022 15:39:00 -0300 Subject: [PATCH 2/9] minor updates --- codemeta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemeta.json b/codemeta.json index 58649591..1b173e9c 100644 --- a/codemeta.json +++ b/codemeta.json @@ -118,7 +118,7 @@ }, "SystemRequirements": null }, - "fileSize": "5222.4KB", + "fileSize": "5224.627KB", "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", From 3f42c844b466766bc7d8e4185e51cb6f32f503e3 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 14 Aug 2023 11:16:06 -0300 Subject: [PATCH 3/9] badge for total number of downloads --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 26c79164..a7a4c2ed 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ developed.](http://www.repostatus.org/badges/latest/active.svg)](https://www.rep ![RStudio CRAN mirror downloads](http://cranlogs.r-pkg.org/badges/last-month/gsw) ![RStudio CRAN mirror downloads](http://cranlogs.r-pkg.org/badges/last-week/gsw) ![RStudio CRAN mirror downloads](http://cranlogs.r-pkg.org/badges/last-day/gsw) +![RStudio CRAN mirror downloads](https://cranlogs.r-pkg.org/badges/grand-total/gsw) gsw is an R package that provides a connection to software relating to TEOS, the Thermodynamic Equation Of Seawater (see http://www.teos-10.org). This From 7fe169a172287ea5005a350bd179f9069d0fbcd0 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 19 Aug 2024 08:33:31 -0300 Subject: [PATCH 4/9] fix merge conflict --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 7cee0ca4..ea05f8dd 100644 --- a/README.md +++ b/README.md @@ -5,16 +5,10 @@ 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) -<<<<<<< HEAD -![RStudio CRAN mirror downloads](http://cranlogs.r-pkg.org/badges/last-month/gsw) -![RStudio CRAN mirror downloads](http://cranlogs.r-pkg.org/badges/last-week/gsw) -![RStudio CRAN mirror downloads](http://cranlogs.r-pkg.org/badges/last-day/gsw) -======= [![R-hub](https://github.com/dankelley/GSW-R/actions/workflows/rhub.yaml/badge.svg)](https://github.com/dankelley/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) ->>>>>>> develop ![RStudio CRAN mirror downloads](https://cranlogs.r-pkg.org/badges/grand-total/gsw) gsw is an R package that provides a connection to software relating to TEOS, From 70aa3b35bc877a2cea0a5a2c547331406f178856 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 19 Aug 2024 09:23:33 -0300 Subject: [PATCH 5/9] remove pkgdown action --- .github/workflows/pkgdown.yaml | 49 ---------------------------------- cran-comments.md | 11 ++++---- 2 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 .github/workflows/pkgdown.yaml diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml deleted file mode 100644 index eaac5ef5..00000000 --- a/.github/workflows/pkgdown.yaml +++ /dev/null @@ -1,49 +0,0 @@ -on: - push: - branches: - - main - tags: - -'*' - -name: pkgdown - -jobs: - pkgdown: - runs-on: macOS-latest - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - steps: - - uses: actions/checkout@v2 - - - uses: r-lib/actions/setup-r@v1 - - - uses: r-lib/actions/setup-pandoc@v1 - - - name: Query dependencies - run: | - install.packages('remotes') - saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) - writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") - shell: Rscript {0} - - - name: Restore R package cache - uses: actions/cache@v2 - with: - path: ${{ env.R_LIBS_USER }} - key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} - restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- - - - name: Install dependencies - run: | - remotes::install_deps(dependencies = TRUE) - install.packages("pkgdown", type = "binary") - shell: Rscript {0} - - - name: Install package - run: R CMD INSTALL . - - - name: Deploy package - run: | - git config --local user.email "actions@github.com" - git config --local user.name "GitHub Actions" - Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)' diff --git a/cran-comments.md b/cran-comments.md index ec010184..7bfc87fd 100644 --- a/cran-comments.md +++ b/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. From 752fe0c648484ecd7622414883ccfa0e1c6d8610 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 19 Aug 2024 09:29:44 -0300 Subject: [PATCH 6/9] add pkgdown action --- .github/workflows/pkgdown.yaml | 50 ++++++++++++++++++++++++++++++++++ _pkgdown.yml | 5 +++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/pkgdown.yaml diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml new file mode 100644 index 00000000..4bbce750 --- /dev/null +++ b/.github/workflows/pkgdown.yaml @@ -0,0 +1,50 @@ +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples +# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help +on: + push: + branches: [main, master] + pull_request: + branches: [main, master] + release: + types: [published] + workflow_dispatch: + +name: pkgdown.yaml + +permissions: read-all + +jobs: + pkgdown: + runs-on: ubuntu-latest + # Only restrict concurrency for non-PR jobs + concurrency: + group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }} + env: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + permissions: + contents: write + steps: + - uses: actions/checkout@v4 + + - uses: r-lib/actions/setup-pandoc@v2 + + - uses: r-lib/actions/setup-r@v2 + with: + use-public-rspm: true + + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::pkgdown, local::. + needs: website + + - name: Build site + run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) + shell: Rscript {0} + + - name: Deploy to GitHub pages 🚀 + if: github.event_name != 'pull_request' + uses: JamesIves/github-pages-deploy-action@v4.5.0 + with: + clean: false + branch: gh-pages + folder: docs diff --git a/_pkgdown.yml b/_pkgdown.yml index d703cd38..62ee5ad9 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -1 +1,4 @@ -url: http://teos-10.github.io/GSW-R +url: http://teos-10.github.io/GSW-R/ +template: + bootstrap: 5 + From 897aec864da7f3dd0233f821bbc81325b2d82975 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 19 Aug 2024 09:34:58 -0300 Subject: [PATCH 7/9] does rhub badge work now? --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea05f8dd..0fc8f6ed 100644 --- a/README.md +++ b/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) From 8cd40b71f515594c1d3c7a33c6e9d5780bfca6c4 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 19 Aug 2024 09:56:16 -0300 Subject: [PATCH 8/9] remove pkgdown.yaml because we do this manually --- .github/workflows/pkgdown.yaml | 50 ---------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 .github/workflows/pkgdown.yaml diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml deleted file mode 100644 index 4bbce750..00000000 --- a/.github/workflows/pkgdown.yaml +++ /dev/null @@ -1,50 +0,0 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples -# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help -on: - push: - branches: [main, master] - pull_request: - branches: [main, master] - release: - types: [published] - workflow_dispatch: - -name: pkgdown.yaml - -permissions: read-all - -jobs: - pkgdown: - runs-on: ubuntu-latest - # Only restrict concurrency for non-PR jobs - concurrency: - group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }} - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - permissions: - contents: write - steps: - - uses: actions/checkout@v4 - - - uses: r-lib/actions/setup-pandoc@v2 - - - uses: r-lib/actions/setup-r@v2 - with: - use-public-rspm: true - - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: any::pkgdown, local::. - needs: website - - - name: Build site - run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) - shell: Rscript {0} - - - name: Deploy to GitHub pages 🚀 - if: github.event_name != 'pull_request' - uses: JamesIves/github-pages-deploy-action@v4.5.0 - with: - clean: false - branch: gh-pages - folder: docs From 8389cc4b1cb16960a07cb3ac4a32b3fecb7574b2 Mon Sep 17 00:00:00 2001 From: dankelley Date: Mon, 19 Aug 2024 09:58:54 -0300 Subject: [PATCH 9/9] improve a comment --- check_package.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_package.R b/check_package.R index 668b69ba..03bf39c1 100644 --- a/check_package.R +++ b/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")