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 Image diagraming NPSdataverse and its consituent packages using hexicons A hexicon of NPSdataverse points to the hexicons for the 4 NPS-maintained packages that load with the NPSdataverse: QCkit, EMLeditor, DPchecker, and NPSutils. The key external packages EML and EMLassemblyline that also load are included in a text box. @@ -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 @@ - + Page not found (404) • NPSdataverse - - - - - + + + + + + + - - Skip to contents - - -
-
-
+
+ + +
- + diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index d55509b..a449eb8 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -1,54 +1,78 @@ -License • NPSdataverse - Skip to contents - - -
-
-
+
+ - + diff --git a/docs/LICENSE.html b/docs/LICENSE.html index 48217ac..1d07125 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -1,36 +1,52 @@ -CC0 1.0 Universal • NPSdataverse - Skip to contents - - -
-
-
+ diff --git a/docs/articles/NPSdataverse.html b/docs/articles/NPSdataverse.html index ff2f769..f4966a3 100644 --- a/docs/articles/NPSdataverse.html +++ b/docs/articles/NPSdataverse.html @@ -4,84 +4,110 @@ - + NPSdataverse • NPSdataverse - - - - - + + + + + + + - - Skip to contents - - -
- - + +
+ -
-
+library(NPSdataverse)
+
+ + +
- + diff --git a/docs/articles/index.html b/docs/articles/index.html index c61137e..6ddeb4a 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -1,56 +1,75 @@ -Articles • NPSdataverse - Skip to contents - - -
-
-
+
+ - + diff --git a/docs/authors.html b/docs/authors.html index 6b21a5b..d446155 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -1,39 +1,55 @@ -Authors and Citation • NPSdataverse - Skip to contents - - -
-
-
+
+
+
+ -
-

Authors

  • Robert Baker. Author, maintainer. @@ -48,37 +64,42 @@

    Authors

+
+
+

Citation

+ Source: DESCRIPTION +
+
-
-

Citation

-

Source: DESCRIPTION

-

Baker R, Patterson J, DeVivo J (2024). +

Baker R, Patterson J, DeVivo J (2024). NPSdataverse: Tools and Packages for Data and Metadata Manipulation. -R package version 0.1.0, https://github.com/nationalparkservice/NPSdataverse. +R package version 0.1.0, https://github.com/nationalparkservice/NPSdataverse.

-
@Manual{,
+    
@Manual{,
   title = {NPSdataverse: Tools and Packages for Data and Metadata Manipulation},
   author = {Robert Baker and Judd Patterson and Joe DeVivo},
   year = {2024},
   note = {R package version 0.1.0},
   url = {https://github.com/nationalparkservice/NPSdataverse},
 }
-
-
+
+ + + - + diff --git a/docs/index.html b/docs/index.html index 6c21ae8..ca263fa 100644 --- a/docs/index.html +++ b/docs/index.html @@ -4,60 +4,83 @@ - + Tools and Packages for Data and Metadata Manipulation • NPSdataverse - - - - - - + + + + + + + - - Skip to contents - - -
-
-
+
-

Image diagraming NPSdataverse and its consituent packages using hexicons A hexicon of NPSdataverse points to the hexicons for the 4 NPS-maintained packages that load with the NPSdataverse: QCkit, EMLeditor, DPchecker, and NPSutils. The key external packages EML and EMLassemblyline that also load are included in a text box. NPSdataverse loads a suite of R packages for creating, manipulating, and accessing data packages including interacting with DataStore. This is an early version of the NPSdataverse. Please request enhancements and bug fixes through Issues.

+

Image diagraming NPSdataverse and its consituent packages using hexicons A hexicon of NPSdataverse points to the hexicons for the 4 NPS-maintained packages that load with the NPSdataverse: QCkit, EMLeditor, DPchecker, and NPSutils. The key external packages EML and EMLassemblyline that also load are included in a text box. NPSdataverse loads a suite of R packages for creating, manipulating, and accessing data packages including interacting with DataStore. This is an early version of the NPSdataverse. Please request enhancements and bug fixes through Issues.

Installation

You can install the development version of NPSdataverse from GitHub with:

-# install.packages("devtools")
-devtools::install_github("nationalparkservice/NPSdataverse")
+# install.packages("pak") +pak::pkg_install("nationalparkservice/NPSdataverse")

NPSdataverse will install the following R packages:

@@ -109,7 +132,7 @@

Trouble shooting installation

Updating NPSdataverse packages

-

Many of the NPSdataverse packages are in a phase of rapid development. When you load the NPSdataverse (using library(NPSdataverse)), if you are online, NPSdataverse will check for new versions of the packages stored on GitHub (all the packages except r/EML). NPSdataverse will tell you if all your packages are up to date. Conversely if any of the NPSdataverse packages need to be updated, NPSdataverse will indicate which packages need updating and how to perform the updates. If you do not get any notices about whether your packages are up to date or not, then the NPSdataverse package itself needs to be updated. See Installation for instructions on how to update the NPSdataverse package.

+

Many of the NPSdataverse packages are in a phase of rapid development. When you load the NPSdataverse (using library(NPSdataverse)), if you are online, NPSdataverse will check for new versions of the packages stored on GitHub (all the packages except r/EML). NPSdataverse will tell you if all your packages are up to date. Conversely if any of the NPSdataverse packages need to be updated, NPSdataverse will indicate which packages need updating and how to perform the updates. If you do not get any notices about whether your packages are up to date or not, then the NPSdataverse package itself needs to be updated. See Installation for instructions on how to update the NPSdataverse package.

Creating data packages @@ -121,11 +144,15 @@

Creating data packagesThis will open a new file on that you can edit to generate EML metadata for your data package. See the web pages associated with EMLeditor for additional information, instructions, and examples.

- + -
+ diff --git a/docs/news/index.html b/docs/news/index.html index 3c4d57a..25d4d54 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -1,74 +1,97 @@ -Changelog • NPSdataverse - Skip to contents - - -
-
-
+
+ -
- +
+ diff --git a/docs/paper.html b/docs/paper.html index 3a685e0..d6d10f7 100644 --- a/docs/paper.html +++ b/docs/paper.html @@ -1,36 +1,52 @@ -Summary • NPSdataverse - Skip to contents - - -
-
-
-
+
+ diff --git a/docs/reference/detach_NPSdataverse.html b/docs/reference/detach_NPSdataverse.html index 65e7cfc..7b26b30 100644 --- a/docs/reference/detach_NPSdataverse.html +++ b/docs/reference/detach_NPSdataverse.html @@ -1,73 +1,93 @@ -Detach all loaded packages — detach_NPSdataverse • NPSdataverse - Skip to contents - - -
-
-
+
+ +
-
+
+ diff --git a/docs/reference/dot-print_cust_package_deps.html b/docs/reference/dot-print_cust_package_deps.html index 1e0a4cc..f09742f 100644 --- a/docs/reference/dot-print_cust_package_deps.html +++ b/docs/reference/dot-print_cust_package_deps.html @@ -1,50 +1,66 @@ -Custom print function for github repos to update — .print_cust_package_deps • NPSdataverse - Skip to contents - - -
-
-
+
+ + -
+
+ diff --git a/docs/reference/dot-update_git_repos.html b/docs/reference/dot-update_git_repos.html index c75f7de..d5c17ff 100644 --- a/docs/reference/dot-update_git_repos.html +++ b/docs/reference/dot-update_git_repos.html @@ -1,66 +1,86 @@ -Update info for git repos in NPSdataverse — .update_git_repos • NPSdataverse - Skip to contents - - -
-
-
+
+ + -
+
+ diff --git a/docs/reference/index.html b/docs/reference/index.html index d8aaae0..7a4f750 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -1,79 +1,88 @@ -Package index • NPSdataverse - Skip to contents - - -
-
-
+

+ + + + + + +
+

All functions

+

+
+

detach_NPSdataverse()

+

Detach all loaded packages

+

is_online()

+

Check internet connectivity

+

NPSdataverse_packages()

+

List all packages imported by NPSdataverse

+ + +
-
+
+ diff --git a/docs/reference/is_online.html b/docs/reference/is_online.html index dd9f23a..052cf5d 100644 --- a/docs/reference/is_online.html +++ b/docs/reference/is_online.html @@ -1,80 +1,100 @@ -Check internet connectivity — is_online • NPSdataverse - Skip to contents - - -
-
-
+
+ +
- + diff --git a/docs/sitemap.xml b/docs/sitemap.xml index f2a112b..f2436e8 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -1,18 +1,19 @@ -https://github.com/nationalparkservice/NPSdataverse/404.html -https://github.com/nationalparkservice/NPSdataverse/articles/index.html -https://github.com/nationalparkservice/NPSdataverse/articles/NPSdataverse.html -https://github.com/nationalparkservice/NPSdataverse/authors.html -https://github.com/nationalparkservice/NPSdataverse/index.html -https://github.com/nationalparkservice/NPSdataverse/LICENSE-text.html -https://github.com/nationalparkservice/NPSdataverse/LICENSE.html -https://github.com/nationalparkservice/NPSdataverse/news/index.html -https://github.com/nationalparkservice/NPSdataverse/paper.html -https://github.com/nationalparkservice/NPSdataverse/reference/detach_NPSdataverse.html -https://github.com/nationalparkservice/NPSdataverse/reference/dot-print_cust_package_deps.html -https://github.com/nationalparkservice/NPSdataverse/reference/dot-update_git_repos.html -https://github.com/nationalparkservice/NPSdataverse/reference/index.html -https://github.com/nationalparkservice/NPSdataverse/reference/is_online.html -https://github.com/nationalparkservice/NPSdataverse/reference/NPSdataverse_packages.html +/404.html +/articles/index.html +/articles/NPSdataverse.html +/authors.html +/index.html +/LICENSE-text.html +/LICENSE.html +/news/index.html +/paper.html +/reference/detach_NPSdataverse.html +/reference/dot-print_cust_package_deps.html +/reference/dot-update_git_repos.html +/reference/index.html +/reference/is_online.html +/reference/NPSdataverse-package.html +/reference/NPSdataverse_packages.html diff --git a/man/NPSdataverse-package.Rd b/man/NPSdataverse-package.Rd new file mode 100644 index 0000000..cdd7ecf --- /dev/null +++ b/man/NPSdataverse-package.Rd @@ -0,0 +1,29 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/NPSdataverse-package.R +\docType{package} +\name{NPSdataverse-package} +\alias{NPSdataverse} +\alias{NPSdataverse-package} +\title{NPSdataverse: Tools and Packages for Data and Metadata Manipulation} +\description{ +Loads a suite of R packages for creating and manipulating data packages including interacting with DataStore. +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/nationalparkservice/NPSdataverse} + \item Report bugs at \url{https://github.com/nationalparkservice/NPSdataverse/issues} +} + +} +\author{ +\strong{Maintainer}: Robert Baker \email{robert_baker@nps.gov} (\href{https://orcid.org/0000-0001-7591-5035}{ORCID}) + +Authors: +\itemize{ + \item Judd Patterson \email{Judd_Patterson@nps.gov} (\href{https://orcid.org/0000-0002-0951-7917}{ORCID}) + \item Joe DeVivo \email{Joe_DeVivo@nps.gov} (\href{https://orcid.org/0000-0002-0414-7865}{ORCID}) +} + +} +\keyword{internal} diff --git a/man/figures/lifecycle-deprecated.svg b/man/figures/lifecycle-deprecated.svg new file mode 100644 index 0000000..b61c57c --- /dev/null +++ b/man/figures/lifecycle-deprecated.svg @@ -0,0 +1,21 @@ + + lifecycle: deprecated + + + + + + + + + + + + + + + lifecycle + + deprecated + + diff --git a/man/figures/lifecycle-experimental.svg b/man/figures/lifecycle-experimental.svg new file mode 100644 index 0000000..5d88fc2 --- /dev/null +++ b/man/figures/lifecycle-experimental.svg @@ -0,0 +1,21 @@ + + lifecycle: experimental + + + + + + + + + + + + + + + lifecycle + + experimental + + diff --git a/man/figures/lifecycle-stable.svg b/man/figures/lifecycle-stable.svg new file mode 100644 index 0000000..9bf21e7 --- /dev/null +++ b/man/figures/lifecycle-stable.svg @@ -0,0 +1,29 @@ + + lifecycle: stable + + + + + + + + + + + + + + + + lifecycle + + + + stable + + + diff --git a/man/figures/lifecycle-superseded.svg b/man/figures/lifecycle-superseded.svg new file mode 100644 index 0000000..db8d757 --- /dev/null +++ b/man/figures/lifecycle-superseded.svg @@ -0,0 +1,21 @@ + + lifecycle: superseded + + + + + + + + + + + + + + + lifecycle + + superseded + +