diff --git a/.Rbuildignore b/.Rbuildignore index 1adda71..759bef1 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,3 +1,4 @@ +^CRAN-RELEASE$ ^.*\.Rproj$ ^\.Rproj\.user$ .*\.toc$ @@ -14,3 +15,4 @@ ^stickers$ vignettes/.*_cache$ vignettes/.*\.log$ +^CRAN-SUBMISSION$ diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index f6bfba0..c86d4b7 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,57 +1,26 @@ +## Thin caller -- the matrix, system dependencies, caching, Drive staging +## and the check itself all live in PredictiveEcology/actions. This file only +## says which package to check and what it needs on top of the org defaults. +## +## Pinned @main deliberately: tags freeze and rot (v0.1/v0.2 kept the +## ubuntugis PPA for months after the workflows rejected it). The actions repo +## gates merges with its own self-test CI. + +name: R-CMD-check + on: push: - branches: - - master - - development + branches: [master, development] pull_request: - branches: - - master - - development - -name: R-CMD-check + branches: [master, development] jobs: R-CMD-check: - if: "!contains(github.event.commits[0].message, '[skip-ci]')" - runs-on: ${{ matrix.config.os }} - - name: ${{ matrix.config.os }} (${{ matrix.config.r }}) - - strategy: - fail-fast: false - matrix: - config: - - {os: macOS-latest, r: 'release'} - - {os: windows-latest, r: 'devel'} - - {os: windows-latest, r: 'release'} - - {os: windows-latest, r: 'oldrel-1'} - - {os: windows-latest, r: 'oldrel-2'} - - {os: ubuntu-latest, r: 'devel'} - - {os: ubuntu-latest, r: 'release'} - - {os: ubuntu-latest, r: 'oldrel-1'} - - {os: ubuntu-latest, r: 'oldrel-2'} - - env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - OMP_THREAD_LIMIT: 4 - R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - - steps: - - uses: actions/checkout@v4 - - - uses: r-lib/actions/setup-pandoc@v2 - - - uses: r-lib/actions/setup-r@v2 - with: - Ncpus: 4 - r-version: ${{ matrix.config.r }} - use-public-rspm: true - - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: | - any::rcmdcheck - - - uses: r-lib/actions/check-r-package@v2 - with: - upload-snapshots: true + uses: PredictiveEcology/actions/.github/workflows/R-CMD-check.yaml@main + with: + extra-env: | + OMP_THREAD_LIMIT=4 + ## Legs beyond the org default 8. These still work and are + ## deliberate back-compat coverage, so they are preserved. + extra-config: | + [{"config": {"os": "ubuntu-latest", "nosuggests": false, "r": "oldrel-2"}}, {"config": {"os": "windows-latest", "nosuggests": false, "r": "oldrel-2"}}] diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index ee45ec7..546bfaf 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -33,15 +33,8 @@ jobs: extra-packages: | any::pkgdown local::. - fastshp=?ignore needs: website - - name: Install additional package dependencies - run: | - pak::pkg_install("remotes") - remotes::install_github("s-u/fastshp") - shell: Rscript {0} - - name: Build site run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) shell: Rscript {0} diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 8f5da9d..a06528f 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -30,13 +30,6 @@ jobs: with: extra-packages: | any::covr - fastshp=?ignore - - - name: Install additional package dependencies - run: | - pak::pkg_install("remotes") - remotes::install_github("s-u/fastshp") - shell: Rscript {0} - name: Test coverage run: covr::codecov() diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION new file mode 100644 index 0000000..519c079 --- /dev/null +++ b/CRAN-SUBMISSION @@ -0,0 +1,4 @@ +Version: 1.0.2 +Date: 2023-07-01 22:43:07 UTC +SHA: + 497e75d89683284b04084660a85a29797d750da5 diff --git a/DESCRIPTION b/DESCRIPTION index 8c1e684..693fa5b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -11,8 +11,8 @@ Description: A high-level plotting system, compatible with `ggplot2` objects, URL: https://quickplot.predictiveecology.org, https://github.com/PredictiveEcology/quickPlot -Version: 1.0.3 -Date: 2025-07-11 +Version: 1.0.4 +Date: 2025-07-14 Authors@R: c( person("Eliot J B", "McIntire", email = "eliot.mcintire@canada.ca", role = c("aut", "cre"), comment=c(ORCID = "https://orcid.org/0000-0002-6914-8316")), @@ -43,8 +43,6 @@ Suggests: sp, testthat (>= 1.0.2), withr -Remotes: - tidyverse/ggplot2 Additional_repositories: https://predictiveecology.r-universe.dev/ Encoding: UTF-8 Language: en-CA diff --git a/NEWS.md b/NEWS.md index b922a6b..93e9584 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# quickPlot (development version) +# quickPlot 1.0.4 * drop support for R <= 4.2; * remove defunct dependency `fastshp` (#35); diff --git a/README.md b/README.md index 5a36a45..28521ce 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,6 @@ This has great utility for quick visualizations when testing code, with the key ## Installation -The suggested package `fastshp` can be installed with: - -```{r} -install.packages("fastshp", repos = "https://rforge.net", type = "source") or for binary: -install.packages('fastshp', repos = 'https://PredictiveEcology.r-universe.dev') -``` - Building packages from source requires the appropriate development libraries for your operating system (*e.g.*, Windows users should install [Rtools](https://cran.r-project.org/bin/windows/Rtools/)). ### Current stable release diff --git a/codecov.yml b/codecov.yml index 04c5585..8f86f2c 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,3 +1,9 @@ +codecov: + ## This repo's default branch is `main`; without this Codecov falls back to + ## `master`, which does not exist here, so the repo total is computed from + ## nothing and reads far below the real figure. + branch: main + comment: false coverage: diff --git a/cran-comments.md b/cran-comments.md index 4992330..c6163fb 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,27 +1,25 @@ ## Updated release -This is a medium update that further deals with migration to `terra` and `sf`, and removes `rgdal`, `rgeos`, and `maptools`. +This is an update that is required due to the changes in ggplot2 V4.0 that is coming to CRAN. ## Test environments ### GitHub Actions - os: macOS-latest, r: 'release' - os: windows-latest, r: 'devel' -- os: windows-latest, r: 'latest' -.- os: windows-latest, r: 'oldrel' +- os: windows-latest, r: 'release' +- os: windows-latest, r: 'oldrel1' +- os: windows-latest, r: 'oldrel2' - os: ubuntu-20.04, r: 'devel', - os: ubuntu-20.04, r: 'release' -- os: ubuntu-20.04, r: 'oldrel' +- os: ubuntu-20.04, r: 'oldrel1' +- os: ubuntu-20.04, r: 'oldrel2' -### Winbuilder -* Windows (win-builder), R Under development (unstable) (2023-06-29 r84618 ucrt) -* Windows (win-builder), 4.3.1 (2023-04-21 ucrt) -* Windows (win-builder), 4.2.3 (2023-03-15 ucrt) +### Local +* Windows R version 4.5.0 (2025-04-11 ucrt) +* Ubuntu 4.4.3 -### R-hub -* Linux (Debian, Fedora), MacOS, Windows - ## R CMD check results There were no ERRORs nor WARNINGs nor NOTEs. @@ -31,7 +29,7 @@ There were no ERRORs nor WARNINGs nor NOTEs. > revdepcheck::revdep_report_cran() ## update cran-comments with this output ## revdepcheck results -We checked 2 reverse dependencies (0 from CRAN + 2 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. +We checked 4 reverse dependencies (4 from CRAN), comparing R CMD check results across CRAN and dev versions of this package. * We saw 0 new problems * We failed to check 0 packages