From b09fdf53cd88955a6be2f9a1c3751ebc7cb93ea3 Mon Sep 17 00:00:00 2001 From: Rob Baker Date: Wed, 21 Aug 2024 21:36:52 -0600 Subject: [PATCH 1/6] update roxygen --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index b330f62..446beb4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -19,7 +19,7 @@ License: CC0 BugReports: https://github.com/nationalparkservice/EMLeditor/issues Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 Remotes: NCEAS/arcticdatautils, nationalparkservice/DPchecker, From db5de8883f1c4dc3c59e1b589a40ed304baa132d Mon Sep 17 00:00:00 2001 From: Rob Baker Date: Wed, 21 Aug 2024 21:37:05 -0600 Subject: [PATCH 2/6] add update about project id tag --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index c1a6844..8ca03b7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,6 @@ # EMLeditor v0.1.6 (in progress) +## 2024-08-21 + * add id tag to projects to help DataStore identify DataStore projects vs. other projects. ## 2024-08-20 * add helper.R file with a test_path function to facilitate unit tests * update unit test code to run both interactively and during build checks From 07e3f3ebcf556d5eed5b4b2c8ebddeeb054d845e Mon Sep 17 00:00:00 2001 From: Rob Baker Date: Wed, 21 Aug 2024 21:37:29 -0600 Subject: [PATCH 3/6] update github actions yaml documentation: links to the bug fix --- .github/workflows/R-CMD-check.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index c40e40a..4e9ba19 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,5 +1,9 @@ -# 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 +# 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 +# unix build check fix applied from: +# 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] From 388625aa4d62d6a7bd9218c09d171c06c67d1173 Mon Sep 17 00:00:00 2001 From: Rob Baker Date: Wed, 21 Aug 2024 21:37:41 -0600 Subject: [PATCH 4/6] delete extraneous files --- .github/workflows/pkgdown.yaml | 46 ---------------------------------- 1 file changed, 46 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 087f0b0..0000000 --- a/.github/workflows/pkgdown.yaml +++ /dev/null @@ -1,46 +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 - -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 }} - steps: - - uses: actions/checkout@v3 - - - 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.4.1 - with: - clean: false - branch: gh-pages - folder: docs From 7976c85b3f0455c444176f18d6e0caef1f2249a7 Mon Sep 17 00:00:00 2001 From: Rob Baker Date: Wed, 21 Aug 2024 21:38:12 -0600 Subject: [PATCH 5/6] add "DataStore_project" to the project id field when using set_project --- R/editEMLfunctions.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/editEMLfunctions.R b/R/editEMLfunctions.R index a9ec824..97e0292 100644 --- a/R/editEMLfunctions.R +++ b/R/editEMLfunctions.R @@ -1633,7 +1633,7 @@ set_project <- function(eml_object, organizationName = project_org, onlineUrl = project_url, role = project_role - ) + ), id = "DataStore_project" ) eml_object$dataset$project <- proj From 31c9bf573f8cc2d11e34e19ab44107261a288177 Mon Sep 17 00:00:00 2001 From: Rob Baker Date: Wed, 21 Aug 2024 21:38:38 -0600 Subject: [PATCH 6/6] updated via devtools and pkgdown --- docs/404.html | 30 ++-- docs/LICENSE-text.html | 2 +- docs/LICENSE.html | 4 +- docs/articles/a01_prereqs.html | 4 +- docs/articles/a02_EML_creation_script.html | 6 +- docs/articles/a03_Template_edits.html | 6 +- docs/articles/a04_Editing_fixing_eml.html | 4 +- docs/articles/a05_advanced_functionality.html | 4 +- docs/articles/index.html | 2 +- docs/authors.html | 6 +- docs/index.html | 6 +- docs/news/index.html | 9 +- docs/pkgdown.yml | 6 +- docs/reference/EMLeditor-package.html | 8 +- docs/reference/EMLeditor.html | 4 +- docs/reference/check_eml.html | 4 +- docs/reference/dot-get_unit_polygon.html | 4 +- docs/reference/dot-get_user_input.html | 4 +- docs/reference/dot-get_user_input3.html | 4 +- docs/reference/dot-set_for_by_nps.html | 4 +- docs/reference/dot-set_npspublisher.html | 4 +- docs/reference/dot-set_version.html | 4 +- docs/reference/get_abstract.html | 4 +- docs/reference/get_additional_info.html | 4 +- docs/reference/get_author_list.html | 4 +- docs/reference/get_begin_date.html | 4 +- docs/reference/get_citation.html | 4 +- docs/reference/get_content_units.html | 4 +- docs/reference/get_cui.html | 4 +- docs/reference/get_cui_code.html | 4 +- docs/reference/get_cui_marking.html | 4 +- docs/reference/get_doi.html | 4 +- docs/reference/get_drr_doi.html | 4 +- docs/reference/get_drr_title.html | 4 +- docs/reference/get_ds_id.html | 4 +- docs/reference/get_end_date.html | 4 +- docs/reference/get_file_info.html | 4 +- docs/reference/get_lit.html | 4 +- docs/reference/get_methods.html | 4 +- docs/reference/get_producing_units.html | 4 +- docs/reference/get_publisher.html | 4 +- docs/reference/get_title.html | 4 +- docs/reference/index.html | 2 +- docs/reference/remove_datastore_files.html | 4 +- docs/reference/set_abstract.html | 4 +- docs/reference/set_additional_info.html | 4 +- docs/reference/set_content_units.html | 4 +- docs/reference/set_creator_orcids.html | 4 +- docs/reference/set_creator_order.html | 4 +- docs/reference/set_creator_orgs.html | 4 +- docs/reference/set_cui.html | 4 +- docs/reference/set_cui_code.html | 4 +- docs/reference/set_cui_marking.html | 4 +- docs/reference/set_data_urls.html | 4 +- docs/reference/set_datastore_doi.html | 4 +- docs/reference/set_doi.html | 4 +- docs/reference/set_drr.html | 4 +- docs/reference/set_int_rights.html | 4 +- docs/reference/set_language.html | 4 +- docs/reference/set_lit.html | 4 +- docs/reference/set_methods.html | 4 +- docs/reference/set_missing_data.html | 4 +- docs/reference/set_new_creator.html | 4 +- docs/reference/set_producing_units.html | 4 +- docs/reference/set_project.html | 4 +- docs/reference/set_protocol.html | 4 +- docs/reference/set_publisher.html | 4 +- docs/reference/set_title.html | 4 +- docs/reference/upload_data_package.html | 4 +- docs/reference/write_readme.html | 4 +- docs/search.json | 2 +- docs/sitemap.xml | 136 +++++++++--------- 72 files changed, 229 insertions(+), 228 deletions(-) diff --git a/docs/404.html b/docs/404.html index 367fd1e..ec1bf8c 100644 --- a/docs/404.html +++ b/docs/404.html @@ -6,19 +6,19 @@ Page not found (404) • EMLeditor - - - - - + + + + + - Skip to contents + Skip to contents