diff --git a/.Rbuildignore b/.Rbuildignore index ca8575e..d154c3f 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -5,3 +5,4 @@ ^_pkgdown\.yml$ ^docs$ ^pkgdown$ +^\.github$ diff --git a/.github/.gitignore b/.github/.gitignore new file mode 100644 index 0000000..2d19fc7 --- /dev/null +++ b/.github/.gitignore @@ -0,0 +1 @@ +*.html diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml new file mode 100644 index 0000000..c5ab1df --- /dev/null +++ b/.github/workflows/R-CMD-check.yaml @@ -0,0 +1,59 @@ +# 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 +# fix linux build fails: +# https://forum.posit.co/t/libraptor2-dev-depends-libcurl4-gnutls-dev-but-it-is-not-installable-in-r-lib-actions-setup-r-dependencies-v2/181572/4 +on: + push: + branches: [main, master] + pull_request: + branches: [main, master] + +name: R-CMD-check.yaml + +permissions: read-all + +jobs: + R-CMD-check: + 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: 'release'} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'oldrel-1'} + + env: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + R_KEEP_PKG_SOURCE: yes + PKG_SYSREQS: false + + steps: + - uses: actions/checkout@v4 + + - uses: r-lib/actions/setup-pandoc@v2 + + - uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ matrix.config.r }} + http-user-agent: ${{ matrix.config.http-user-agent }} + use-public-rspm: true + + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::rcmdcheck + needs: check + + - name: dependencies on Linux + if: runner.os == 'Linux' + run: sudo apt-get install -y make pandoc git libjq-dev libssl-dev libgdal-dev gdal-bin libgeos-dev libproj-dev libsqlite3-dev libicu-dev libudunits2-dev librdf0-dev libxml2-dev libfreetype6-dev libjpeg-dev libpng-dev libtiff-dev libfontconfig1-dev libfribidi-dev libharfbuzz-dev libcurl4-gnutls-dev + + - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true + build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' diff --git a/DESCRIPTION b/DESCRIPTION index 672fde1..e0db07f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,7 +16,7 @@ Description: Loads a suite of R packages for creating and manipulating data pack License: CC0 Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 Imports: cli, crayon, @@ -28,7 +28,8 @@ Imports: QCkit (>= 0.1.0), rstudioapi, utils, - remotes + remotes, + lifecycle Remotes: nationalparkservice/DPchecker, nationalparkservice/EMLeditor, diff --git a/NAMESPACE b/NAMESPACE index cbb4f1f..397a97c 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -3,3 +3,4 @@ export(NPSdataverse_packages) export(detach_NPSdataverse) export(is_online) +importFrom(lifecycle,deprecated) diff --git a/R/NPSdataverse-package.R b/R/NPSdataverse-package.R new file mode 100644 index 0000000..425b3c1 --- /dev/null +++ b/R/NPSdataverse-package.R @@ -0,0 +1,7 @@ +#' @keywords internal +"_PACKAGE" + +## usethis namespace: start +#' @importFrom lifecycle deprecated +## usethis namespace: end +NULL diff --git a/README.Rmd b/README.Rmd index 42eba5a..a43e93d 100644 --- a/README.Rmd +++ b/README.Rmd @@ -4,6 +4,10 @@ output: github_document + + [![R-CMD-check](https://github.com/nationalparkservice/NPSdataverse/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/nationalparkservice/NPSdataverse/actions/workflows/R-CMD-check.yaml) + + ```{r, include = FALSE} knitr::opts_chunk$set( collapse = TRUE, @@ -32,8 +36,8 @@ NPSdataverse loads a suite of R packages for creating, manipulating, and accessi You can install the development version of NPSdataverse from [GitHub](https://github.com/) with: ``` r -# install.packages("devtools") -devtools::install_github("nationalparkservice/NPSdataverse") +# install.packages("pak") +pak::pkg_install("nationalparkservice/NPSdataverse") ``` NPSdataverse will install the following R packages: diff --git a/README.md b/README.md index 2c79809..57731ad 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ + +[![R-CMD-check](https://github.com/nationalparkservice/NPSdataverse/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/nationalparkservice/NPSdataverse/actions/workflows/R-CMD-check.yaml) + + # NPSdataverse @@ -16,8 +20,8 @@ You can install the development version of NPSdataverse from [GitHub](https://github.com/) with: ``` r -# install.packages("devtools") -devtools::install_github("nationalparkservice/NPSdataverse") +# install.packages("pak") +pak::pkg_install("nationalparkservice/NPSdataverse") ``` NPSdataverse will install the following R packages: diff --git a/_pkgdown.yml b/_pkgdown.yml deleted file mode 100644 index 48e011e..0000000 --- a/_pkgdown.yml +++ /dev/null @@ -1,4 +0,0 @@ -url: https://github.com/nationalparkservice/NPSdataverse -template: - bootstrap: 5 - diff --git a/docs/404.html b/docs/404.html index 68ba20f..4420d9c 100644 --- a/docs/404.html +++ b/docs/404.html @@ -4,73 +4,103 @@ - +