-
Notifications
You must be signed in to change notification settings - Fork 0
betydata R data package with BETYdb public data export #12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
divine7022
wants to merge
58
commits into
main
Choose a base branch
from
mvp-betydata
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
58 commits
Select commit
Hold shift + click to select a range
1866c45
update DESCRIPTION
divine7022 ff1485f
add .Rbuildignore
divine7022 4c1bada
add git workflows
divine7022 c8d41b5
ad gitignore
divine7022 86bee56
add citation
divine7022 dce94e3
add NEWS.md
divine7022 0a1b59b
add dataset doc
divine7022 164df97
add readme
divine7022 6d69f73
add csv data
divine7022 b3f17cb
add .rda files
divine7022 f632581
add inst/
divine7022 29e0fd0
add .Rd files
divine7022 41362a5
add unit tests
divine7022 cdd8d18
add vignettes
divine7022 69ce06a
add .html and csv to ignore
divine7022 afa3163
update r cmd check
divine7022 dbdf052
add PULL_REQUEST_TEMPLATE.md
divine7022 f4444ac
add maps to DESCRIPTION
divine7022 b6f9ada
add license
divine7022 11bc4ec
udpate .Rd
divine7022 25653dc
add citation to .Rbuildignore
divine7022 3faa298
add jsonlit to DESCRIPTION
divine7022 0265a5c
update roxy
divine7022 4e0d685
clarify citation
dlebauer cf2a620
update build and git ignore rules
divine7022 534e3a0
switch vignette builder to quarto
divine7022 302179a
update license copyright holder
divine7022 3210c15
update package and dataset documentation
divine7022 0b25baf
rewrite readme with current table structure
divine7022 ca7738e
drop access_level column and reorder traitsview columns
divine7022 4b2d304
rebuild data with updated column order
divine7022 cbe9888
regenerate datapackage.json with all table schemas
divine7022 ec66279
update generated man pages
divine7022 ea9e9b9
update tests for new column layout
divine7022 598996e
remove old Rmd vignettes
divine7022 d2f32bb
add quarto vignettes
divine7022 74aa501
vignettes/*_files/ to root
divine7022 884e164
add quarto website config and homepage
divine7022 f84ff1d
add gh-pages deploy workflow
divine7022 335fa35
Merge branch 'mvp-betydata' of github.com:PecanProject/betydata into …
divine7022 c9e1bce
R-CMD-check workflow doesn't install quarto cli. It only installs pan…
divine7022 b5eaf3f
individual vignette rendering, output in-place next to .qmd
divine7022 dfef334
fix know quarto-dev upstream bug #217 on windows; added local::. to p…
divine7022 a4fd3f4
added a hidden setup chunk at the top; this makes vignettes gracefull…
divine7022 eadd8d1
require dplyr >= 1.1.0
dlebauer eb62be5
convert checked=NA to 0 and enforce access_level==4 filter
divine7022 aa65e72
remove arrow from description suggests
divine7022 179678d
update description
divine7022 b07b138
add CITATION
divine7022 17660bc
add preferred-citation block, DOI comment note
divine7022 fb95640
documenting package conventions
divine7022 0730d10
add data reporting section to readme
divine7022 701156f
PR template for corrections
divine7022 3968994
update NEWS with correct vignette names and all changes
divine7022 1256fc8
fix formatting
divine7022 c500a62
fix dependencies
divine7022 e59900f
update resource paths to reference csv source files
divine7022 6fc317f
add csv files
divine7022 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| ^.*.Rproj$ | ||
| ^.Rproj.user$ | ||
| ^README.Rmd$ | ||
| ^LICENSE.md$ | ||
| ^.github$ | ||
| ^data-raw$ | ||
| ^_pkgdown.yml$ | ||
| ^docs$ | ||
| ^pkgdown$ | ||
| ^.lintr$ | ||
| ^codecov.yml$ | ||
| ^.pre-commit-config.yaml$ | ||
| ^renv$ | ||
| ^renv.lock$ | ||
| ^betydata\.Rproj$ | ||
| ^\.Rproj\.user$ | ||
| ^CITATION\.cff$ | ||
| ^vignettes/.*_files$ | ||
| ^_quarto\.yml$ | ||
| ^_site$ | ||
| ^_freeze$ | ||
| ^index\.qmd$ | ||
| ^_publish\.yml$ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --- | ||
| name: Data correction | ||
| about: Report an error in betydata and suggest a correction | ||
| labels: data, correction | ||
| --- | ||
|
|
||
| ### Summary | ||
| <!-- Brief description of the issue --> | ||
|
|
||
| ### Affected Record(s) | ||
|
|
||
| | Field | Value | | ||
| |-------|-------| | ||
| | Dataset | traitsview / species / other | | ||
| | Record ID(s) | | | ||
| | Column(s) | | | ||
|
|
||
| ### Current Value | ||
| <!-- What the data currently shows --> | ||
|
|
||
| ### Suggested Correction | ||
| <!-- What the value should be --> | ||
|
|
||
| ### Source | ||
| <!-- How you know the current value is wrong (publication, original data, etc.) --> | ||
| - Citation/DOI: | ||
| - Page/Table: | ||
| - Additional evidence: | ||
|
|
||
| ### Additional Context | ||
| <!-- Any other relevant information --> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| --- | ||
| name: Verified record report | ||
| about: Report that you have verified a record matches its source | ||
| labels: data, verification | ||
| --- | ||
|
|
||
| ### Summary | ||
| <!-- Which record(s) have you verified? --> | ||
|
|
||
| ### Verified Record(s) | ||
|
|
||
| | Field | Value | | ||
| |-------|-------| | ||
| | Dataset | traitsview / other | | ||
| | Record ID(s) | | | ||
|
|
||
| ### Verification Details | ||
| - Citation/DOI checked: | ||
| - Page/Table/Figure: | ||
| - Date verified: | ||
|
|
||
| ### Confirmation | ||
| - [ ] I have compared the record(s) to the original source | ||
| - [ ] The values match the source publication | ||
| - [ ] The `checked` value should be updated to `1` (passed) | ||
|
|
||
| ### Notes | ||
| <!-- Any discrepancies or observations --> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| ## Description | ||
| <!-- Describe your changes in detail --> | ||
|
|
||
| ## Related Issue(s) | ||
| <!-- Link to issue(s) this PR addresses --> | ||
|
|
||
| ## Type of Change | ||
| <!-- Put an `x` in all boxes that apply --> | ||
| - [ ] Bug fix (non-breaking change which fixes an issue) | ||
| - [ ] New feature (non-breaking change which adds functionality) | ||
| - [ ] Data update (changes to datasets) | ||
| - [ ] Documentation update | ||
| - [ ] Breaking change (fix or feature that would cause existing functionality to change) | ||
|
|
||
| ## Checklist | ||
| <!-- Put an `x` in all boxes that apply --> | ||
| - [ ] I have run `devtools::check()` with no errors or warnings | ||
| - [ ] I have updated NEWS.md if applicable | ||
| - [ ] I have updated documentation if applicable | ||
| - [ ] I have added/updated tests if applicable | ||
|
|
||
| ## Data Changes (if applicable) | ||
| <!-- If this PR modifies data, describe the changes --> | ||
| - [ ] Data rebuilt from source using `data-raw/make-data.R` | ||
| - [ ] datapackage.json updated | ||
| - [ ] Row counts verified | ||
|
|
||
| ## Additional Notes | ||
| <!-- Any other information reviewers should know --> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| ## Data Correction | ||
|
|
||
| ### Summary | ||
| <!-- Brief description of the correction --> | ||
|
|
||
| ### Affected Record(s) | ||
|
|
||
| | Field | Value | | ||
| |-------|-------| | ||
| | Table | traitsview / species / other | | ||
| | Record ID(s) | | | ||
| | Column(s) | | | ||
|
|
||
| ### Current Value | ||
| <!-- What the data currently shows --> | ||
|
|
||
| ### Corrected Value | ||
| <!-- What the value should be --> | ||
|
|
||
| ### Source / Evidence | ||
| <!-- How you verified the correction (publication DOI, original data, etc.) --> | ||
| - Citation/DOI: | ||
| - Page/Table: | ||
|
|
||
| ### Changes Made | ||
|
|
||
| - [ ] Edited CSV in `data-raw/csv/` | ||
| - [ ] Ran `source("data-raw/make-data.R")` to rebuild `.rda` files | ||
| - [ ] Verified correction in the rebuilt data | ||
| - [ ] Updated `NEWS.md` | ||
|
|
||
| ### Checklist | ||
|
|
||
| - [ ] I have compared the corrected value to the original source | ||
| - [ ] `devtools::check()` passes with no errors |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| on: | ||
| push: | ||
| branches: [main, develop] | ||
| pull_request: | ||
| branches: [main, develop] | ||
| workflow_dispatch: # Allow manual triggers | ||
|
|
||
| name: R-CMD-check | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| 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 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: quarto-dev/quarto-actions/setup@v2 | ||
|
|
||
| - 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, local::. | ||
| needs: check | ||
|
|
||
| - uses: r-lib/actions/check-r-package@v2 | ||
| with: | ||
| upload-snapshots: true | ||
| args: 'c("--no-manual", "--as-cran")' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| name: Deploy Quarto site to GitHub Pages | ||
|
|
||
| on: | ||
| push: | ||
| branches: [main] | ||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pages: write | ||
|
|
||
| jobs: | ||
| build-deploy: | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup R | ||
| uses: r-lib/actions/setup-r@v2 | ||
| with: | ||
| use-public-rspm: true | ||
|
|
||
| - name: Install R dependencies | ||
| uses: r-lib/actions/setup-r-dependencies@v2 | ||
| with: | ||
| extra-packages: | | ||
| local::. | ||
| any::dplyr | ||
| any::ggplot2 | ||
| any::knitr | ||
| - name: Setup Quarto | ||
| uses: quarto-dev/quarto-actions/setup@v2 | ||
|
|
||
| - name: Render and deploy to gh-pages | ||
| uses: quarto-dev/quarto-actions/publish@v2 | ||
| with: | ||
| target: gh-pages | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| *.html | ||
| .Rhistory | ||
| .Rdata | ||
| .RData | ||
| .Ruserdata | ||
| .Rproj.user | ||
| *.tar.gz | ||
| *.Rcheck/ | ||
| .DS_Store | ||
| Thumbs.db | ||
| .vscode/ | ||
| *.swp | ||
| renv/library/ | ||
| renv/local/ | ||
| renv/cellar/ | ||
| renv/lock/ | ||
| renv/python/ | ||
| renv/sandbox/ | ||
| _site/ | ||
| _freeze/ | ||
| /.quarto/ | ||
| vignettes/*_files/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| cff-version: 1.2.0 | ||
| title: "betydata: Public Data from the BETYdb Database" | ||
| version: 0.1.0 | ||
| abstract: >- | ||
| An R data package providing offline access to public plant trait and | ||
| crop yield data from the BETYdb (Biofuel Ecophysiological Traits and | ||
| Yields) database. | ||
| license: BSD-3-Clause | ||
| # doi: -- will be assigned by Zenodo on first github release | ||
| message: >- | ||
| If you use this data package, please cite both this software and | ||
| the BETYdb paper (see preferred-citation below). | ||
| type: dataset | ||
| date-released: "2026-02-11" | ||
| repository-code: https://github.com/PecanProject/betydata | ||
| url: https://betydb.org | ||
| keywords: | ||
| - plant traits | ||
| - crop yields | ||
| - bioenergy | ||
| - ecosystem modeling | ||
| - BETYdb | ||
| - PEcAn | ||
| - ecological data | ||
| - R data package | ||
| authors: | ||
| - given-names: David | ||
| family-names: LeBauer | ||
| email: dlebauer@arizona.edu | ||
| affiliation: University of Arizona | ||
| orcid: 'https://orcid.org/0000-0001-7228-053X' | ||
| - given-names: Akash | ||
| family-names: BV | ||
| email: www.divinehome12@gmail.com | ||
dlebauer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| affiliation: CMR Institute of Technology, Bengaluru | ||
| preferred-citation: | ||
| type: article | ||
| title: >- | ||
| BETYdb: a yield, trait, and ecosystem service database applied to | ||
| second-generation bioenergy feedstock production | ||
| authors: | ||
| - given-names: David | ||
| family-names: LeBauer | ||
| - given-names: Rob | ||
| family-names: Kooper | ||
| - given-names: Patrick | ||
| family-names: Mulrooney | ||
| - given-names: Scott | ||
| family-names: Rohde | ||
| - given-names: Dan | ||
| family-names: Wang | ||
| - given-names: Stephen P. | ||
| family-names: Long | ||
| - given-names: Michael C. | ||
| family-names: Dietze | ||
| journal: GCB Bioenergy | ||
| year: 2018 | ||
| volume: 10 | ||
| issue: 1 | ||
| start: 61 | ||
| end: 71 | ||
| doi: "10.1111/gcbb.12420" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,35 @@ | ||
| Package: betydata | ||
| Title: What the Package Does (One Line, Title Case) | ||
| Version: 0.0.0.9000 | ||
| Authors@R: | ||
| person("First", "Last", , "first.last@example.com", role = c("aut", "cre")) | ||
| Description: What the package does (one paragraph). | ||
| License: `use_mit_license()`, `use_gpl3_license()` or friends to pick a | ||
| license | ||
| Type: Package | ||
| Title: Public Data from the BETYdb Database | ||
| Version: 0.1.0 | ||
| Authors@R: c( | ||
| person("David", "LeBauer", email = "dlebauer@arizona.edu", role = c("aut", "cre")), | ||
| person("Akash B V", email = "www.divinehome12@gmail.com", role = "aut") | ||
| ) | ||
| Description: An R data package providing offline access to public data from | ||
| the BETYdb database (betydb.org). Includes plant traits, crop yields, | ||
| and supporting metadata for bioenergy and ecosystem research. This | ||
| package enables reproducible analyses without requiring database access. | ||
| License: BSD_3_clause + file LICENSE | ||
| URL: https://github.com/PecanProject/betydata, | ||
| https://betydb.org | ||
| BugReports: https://github.com/PecanProject/betydata/issues | ||
| Depends: | ||
| R (>= 4.1.0) | ||
| Suggests: | ||
| dplyr (>= 1.1.0), | ||
| ggplot2, | ||
| jsonlite, | ||
| knitr, | ||
| maps, | ||
| quarto, | ||
| rmarkdown, | ||
| testthat (>= 3.0.0) | ||
| VignetteBuilder: quarto | ||
| SystemRequirements: Quarto command line tool (https://github.com/quarto-dev/quarto-cli) | ||
| Encoding: UTF-8 | ||
| LazyData: true | ||
| LazyDataCompression: xz | ||
| Roxygen: list(markdown = TRUE) | ||
| RoxygenNote: 7.3.2 | ||
| RoxygenNote: 7.3.3 | ||
| Config/testthat/edition: 3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| YEAR: 2025 | ||
| COPYRIGHT HOLDER: David LeBauer |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.