Skip to content
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

Prepare for v5.0.0 #787

Merged
merged 105 commits into from
Nov 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
3eee1fd
Merge branch 'master' into develop
dfalster Jan 30, 2023
24def81
Bump version number (develop
dfalster Jan 30, 2023
f22656f
Instructions for creating a release
dfalster Jan 30, 2023
1ed301c
Fix trait defintions vignettes & update docs (#664)
ehwenk Feb 9, 2023
341b829
Merge branch 'master' into develop
dfalster Feb 9, 2023
574a00e
Update syntax to dplyr 1.1.0 (#667)
ehwenk Feb 16, 2023
3b6c720
add new dataset: Gosper 2022 (#671)
ehwenk Feb 22, 2023
21714df
Mistake in allowable ranges (#668)
ehwenk Feb 22, 2023
863aeff
TERN Eucalyptus datasets, Bradshaw_2022 & Morgan_2021 (#666)
ehwenk Feb 22, 2023
1ace24f
add new study: Prior_2022 (#676)
ehwenk Feb 24, 2023
0e0c7d0
Add study: Stephens_2023 (#672)
ehwenk Mar 13, 2023
50efdc6
Add study: Mesaglio_2022 (#678)
yangsophieee Mar 23, 2023
453faaa
add new study: Harvey_2017 (#677)
ehwenk Mar 23, 2023
571c5ab
Add study: vanderMoezel_1987 (#680)
yangsophieee Mar 30, 2023
df36fc1
Add scored fire traits from floras/taxonomic literature: Yang_2023 (#…
yangsophieee Apr 26, 2023
64f905c
Trait definitions edits (#681)
ehwenk May 3, 2023
f4efae6
add new studies: SinghRamesh_2019 & SinghRamesh_2023 (#682)
ehwenk May 3, 2023
383ba3c
add new study: Rain cued flowering from floras (Wenk_2023_2) (#683)
ehwenk May 3, 2023
991b660
Ellsworth_2015: add new study (#685)
ehwenk May 3, 2023
9b1d7f3
update tests to pass testthat 3.1.8 (#689)
ehwenk May 8, 2023
5ecdeec
add new study: Pfautsch_2016 (#687)
ehwenk May 9, 2023
f03032a
add new study: Pirralho_2014 (#691)
ehwenk May 10, 2023
eb020c6
add new study: Burrows_2008 (#690)
ehwenk May 10, 2023
357e1fd
Add new study: Richards 2021 (#692)
yangsophieee May 17, 2023
633a4a1
add new study: Burrows_2020 (#695)
ehwenk May 17, 2023
49245b1
Add new study: Draper_2023 (#694)
yangsophieee May 17, 2023
7dc6317
Add new study: Tolsma_2007 (#697)
yangsophieee May 17, 2023
ddae81b
Add new study: Simpson_2021 (#696)
yangsophieee May 17, 2023
a1b0651
Add new study: Purdie_1976 (#698)
yangsophieee May 17, 2023
eee7d24
Add new study: SmithMartin_2020 (#686)
yangsophieee May 24, 2023
7474017
add new study: Rumman_2017 (#699)
ehwenk May 24, 2023
87ab5d6
Add new study: eFLOWER_Dun_2022 (#700)
ehwenk May 24, 2023
14a0021
Add new studies: Data extracted from textual flora descriptions (#701)
ehwenk Sep 11, 2023
b5ca7ac
Add new study: RussellSmith_2012 (#702)
yangsophieee May 25, 2023
1f11e0c
Add new studies: Santini_2012; Santini_2013; Santini_2016 (#703)
ehwenk May 26, 2023
b7529ef
Add new study: Nano_2011 (#704)
yangsophieee May 26, 2023
438cf60
Add new study: Enright_2014 (#705)
yangsophieee May 26, 2023
a949d8d
Fire response workshop 2023 (#709)
ehwenk May 30, 2023
4358179
Add new study: Mitchell_2008 (#706)
ehwenk Jun 1, 2023
f6ef7c1
Add new study: Kocacinar_2003 (#708)
ehwenk Jun 1, 2023
865416a
Add new study: Searson_2004 (#707)
ehwenk Jun 1, 2023
6ef3814
Add new study: Witkowski_1991 (#710)
ehwenk Jun 2, 2023
3328df5
Add new study: Britton_1994 (#712)
ehwenk Jun 3, 2023
ed85576
Add new study: Cowling_1987 (#713)
ehwenk Jun 4, 2023
4b95113
Add new study: Auld_2000 (#711)
ehwenk Jun 5, 2023
c345eaf
edit metadata_create_template (#716)
ehwenk Jun 6, 2023
9e525e5
add new study: Tsakalos_2022 (#714)
ehwenk Jun 7, 2023
33831ba
Add new study: Brodribb_2000 (#718)
ehwenk Jun 7, 2023
3edab07
Add new study: Collette_2021 (#717)
ehwenk Jun 8, 2023
1ac3fe9
Add new study: Yunusa_2010 (#720)
ehwenk Jun 14, 2023
cc3d22b
Add new study: Pate_1990 (#726)
yangsophieee Jun 15, 2023
0836d10
Flora data fixes (#734)
dcol2804 Jun 19, 2023
6df51d0
Regenerate traits.yml from APD (#727)
ehwenk Jun 20, 2023
294fc1a
Add new study: Sweedman_2006 (#723)
ehwenk Jun 21, 2023
6f73812
Add additional data and new study: Nano_2011 & Crowley_2007 (#730)
yangsophieee Jun 21, 2023
f363fe6
Add new study: Lawes_2014 (#740)
yangsophieee Jun 21, 2023
bb3fa0a
add 3 traits to scraped data files (#724)
ehwenk Jun 21, 2023
7ece6a6
Add new study: Wooller_2002 (#729)
ehwenk Jun 22, 2023
e252308
Add new study: Wilson_2004 (#733)
ehwenk Jun 25, 2023
715a349
Add new studies: Canham_2009 & Canham_2023 (#744)
ehwenk Jun 26, 2023
06e4419
Add new study: He_2011 (#737)
ehwenk Jun 26, 2023
b69ac75
Error entity type (wide data) (#738)
dfalster Jun 26, 2023
72db97e
Add new study: Kubiak_2009 (#742)
yangsophieee Jun 27, 2023
c4a048e
Add_new_study: Pate_1998 (#741)
ehwenk Jun 27, 2023
47e1735
Add new study: DeCampos_2013 (#743)
ehwenk Jun 27, 2023
ab0a884
Add contexts to traits from floras (#748)
ehwenk Jun 27, 2023
bd2dbdd
Add new study: Togashi_2015 (#747)
ehwenk Jun 27, 2023
b15f9fb
Add new study: Grigg_2008 (#750)
GillianKowalick Jun 28, 2023
61b1924
Add new study: Groves_1986 (#751)
GillianKowalick Jun 28, 2023
239f407
Eamus 2000 (#752)
GillianKowalick Jun 28, 2023
e09a833
Fix warnings arising from updates to tidyselect (#739)
dfalster Jun 30, 2023
03a9fad
changes to metadata, so datasets pivot wider (#757)
ehwenk Sep 8, 2023
66ed653
Standardise values for time to flowering type context (#762)
ehwenk Sep 8, 2023
ad4fe57
Tsakalos 2020 (#760)
ehwenk Sep 8, 2023
8f260dc
Fix taxonomic substitutions (#735)
ehwenk Sep 8, 2023
49d1d58
minor edits to metadata context fields (#763)
ehwenk Sep 8, 2023
3ba2acf
Fixes to metadata (#764)
ehwenk Sep 8, 2023
f17ff0d
more pivot errors fixed (#765)
ehwenk Sep 9, 2023
d8404a9
Fix special characters preventing build on Windows (#767)
yangsophieee Sep 12, 2023
be3ff9e
Update taxon_list.csv (#766)
ehwenk Sep 14, 2023
d2680c9
add new study: Wenk_2023 (#761)
ehwenk Sep 14, 2023
c178c13
Fix NAs introduced by coercion warning (#768)
yangsophieee Sep 15, 2023
40a5977
Bump version for release
dfalster Sep 17, 2023
6d0f0f8
Update News script
dfalster Sep 18, 2023
59d7e85
Merge branch 'master' into develop
dfalster Sep 18, 2023
0efc451
Merge branch 'master' into develop
dfalster Sep 18, 2023
0cf1bbb
Bump version number (4.2.0.9000)
dfalster Sep 18, 2023
411f04f
Use traits build (#770)
dfalster Sep 18, 2023
38f6bd9
Remove unneeded context values new (#771)
ehwenk Sep 18, 2023
79c476a
Update remake.yml (#772)
ehwenk Sep 19, 2023
d1ab81c
change austraits_curators to dataset_curators (#773)
ehwenk Sep 19, 2023
bfcbe7d
add `context` to context categories (#774)
ehwenk Sep 19, 2023
be866d6
Documentation: Update readme, contributing guide, remove website and …
dfalster Oct 10, 2023
dfea2c2
Sort taxonomic updates in alphabetical order (#777)
dfalster Nov 1, 2023
c8ef093
renaming taxon fields to match APCalign (#778)
ehwenk Nov 1, 2023
735ad35
Taxonomic updates & new functions for updating taxa, building taxon_l…
ehwenk Nov 3, 2023
2d7445f
remove tests on traits.build functions (#782)
dfalster Nov 3, 2023
ed8dde7
Minor metadata edits 2023 10 (#781)
ehwenk Nov 3, 2023
8f76155
New taxon list (#783)
ehwenk Nov 10, 2023
10dbdf1
rename function (#784)
ehwenk Nov 15, 2023
3aebe9a
Remove unneeded files (#785)
ehwenk Nov 16, 2023
8fb8631
Update metadata
dfalster Nov 16, 2023
915df00
Prepare for v5 release, switch to furrr (#786)
dfalster Nov 16, 2023
65145c5
Minor metadata fixes (#788)
ehwenk Nov 19, 2023
9d82348
Use traits.build 1.0.1, enable tests on all soruces
dfalster Nov 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
80 changes: 75 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@


# Contributing to austraits.build

We envision AusTraits as an on-going collaborative community resource that:
Expand All @@ -7,10 +9,78 @@ We envision AusTraits as an on-going collaborative community resource that:
3. Aspires to fully transparent and reproducible research of highest standard, and
4. Builds a sense of community among contributors and users.

We'd love for you to contribute. You can read more about the ways you can contribute on our website.
We'd love for you to contribute. You can read more about the ways you can contribute below.

- [Contributing new data](#contributing-new-data)
- [Improving data quality and reporting errors ](#improving-data-quality-and-reporting-error)
- [Improving documentation](#improving-documentation)
- [Development of `traits.build` package workflow](development-of-traitsbuild-workflow)


Please note that the AusTraits project has adopted a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By contributing to this project you agree to abide by its terms.

## Improving data quality and reporting error

All users can contribute to continual improvement, by reporting issues you encounter.

If you notice a possible error in AusTraits, please [post an issue on GitHub](https://github.com/traitecoevo/austraits.build/issues). If you can, please provide code illustrating the problem.
## Improving documentation

All users can contribute to continual improvement of AusTraits documentation, by letting us know what parts of our documentation were unclear.

If you have a suggestion, please [post an issue on GitHub](https://github.com/traitecoevo/austraits.build/issues).
## Development of `traits.build`` workflow

AusTraits uses the `traits.build` package to harmonise different sources. Interested users can help us develop this package at the package website <https://github.com/traitecoevo/traits.build/>

## Contributing new data {#data}

We gladly accept new data contributions to AusTraits, including recently collected trait data, legacy trait data from your file archives, transcribed reference works, and transcribed datasets from the literature.

If you would like to contribute data, the requirements are:

- Data was collected for Australian plant species growing in Australia
- You collected data on one of the traits listed in the [trait definitions table](http://traitecoevo.github.io/austraits.build/articles/trait_definitions.html)
- You are willing to release the data under an open license for reuse by the scientific community
- You make it is as easy as possible for us to incorporate your data by following the instructions.

### What do I need to do?

The AusTraits curators will merge each dataset into AusTraits. For each study we carefully check to ensure units are accurate, continuous trait values map in the expected range, categorical trait values map onto sensible terms, location data are accurate, taxon names are aligned to current standards, and all metadata are recorded.



As a first step, all we really require is a **Data Spreadsheet** and a copy of your **Manuscript**.

After completing a series of quality checks, we will send you a report to review that summarises the data and metadata. The reports include plots for each continuous trait, comparing values in your submission to those already in AusTraits. It plots your study locations (sites) on a map. It summarises your metadata and indicates the taxonomic alignments made. The report includes both targeted questions (sometimes) and automated questions, acting as prompts to review aspects of the report. Reviewing your report should not take long, and confirms the transparent, thorough process used to build AusTraits.

### Data

**Your dataset, preferably in a spreadsheet format.**

* **Traits:** Make sure the trait names used in your dataset are easy to interpret or, alternatively, provide a brief definition
* **Units:** Please make sure the units for each trait are provided as part of the trait name or in a separate spreadsheet/worksheet
* **Value type:** We prefer to incorporate raw values (or individual means) in AusTraits, but can use population or multi-site means if that is what is available. For mean values, please provide sample size.
* **Location:** For field studies, please provide location details (see more below).
* **Context:** Optional, but AusTraits can read in one (or more) column(s) with contextual information, such as canopy position, experimental manipulation, dry vs. wet season, etc.
* **Collection date:** Optional, but AusTraits can read in a column with sampling date (in any format)
* **Species/taxa:** Please provide complete species names or a look-up table to match species codes. Out-dated taxonomy is fine – we have name-matching algorithms.

### Metadata

The AusTraits structure has fields to input all metadata associated with your study, including methods, location details, and context. In detail:
* **Methods:** For published studies the necessary methods and study information can be extracted from a publication; just attach a copy of the manuscript or the DOI.
- The only commonly missing information is the general sampling period, such as ‘October-December 2020’; this is only required if your data file doesn't have a date column.
- For unpublished studies, provide brief methods for how each trait was measured; you can simply refer to a standard published protocol
* **Study locations:** Whenever possible, AusTraits includes location names, location coordinates (latitude/longitude), and any other location properties you have measured/recorded (vegetation description, soil chemistry, climate data, etc.). This information can be provided as a second spreadsheet or as additional columns in the main data spreadsheet. Just make sure the location name is the same in both spreadsheets.
* **Context:** If your study includes contextual variables, make sure the context values are included as columns in the data spreadsheet. Also, please make sure the contextual values are self-explanatory or provide the necessary explanation.
* **Authors:** Authorship is extended to anyone who played a key intellectual role in the experimental design and data collection. Most studies have 1-3 authors. For each author, please provide a **name**, **institutional affiliation**, **email address**, and their **ORCID** (if available). Please nominate a single contributor to be the dataset's point of contact; this person's email will not be listed in the metadata file, but is the person future AusTraits users are likely to seek out if they have questions. Additional field assistants can be listed.
* **Source:** The published manuscript is generally the source. If different traits or observations from a single dataset were published separately, please provide both references. If the dataset you are submitting is a compilation from many sources, please provide a complete list of sources and indicate which rows of data are attributable to which source.


### Common hang-ups

### Code of Conduct
Some home issues with contributions include:

Please note that the austraits project is released with a
[Contributor Code of Conduct](CODE_OF_CONDUCT.md). By contributing to this
project you agree to abide by its terms.
* **Categorical trait values:** If you have categorical traits, please define any trait values (i.e. entries for that trait) that are not self-explanatory. A copy of our definitions file, including allowable values for each trait is available [here](http://traitecoevo.github.io/austraits.build/articles/trait_definitions.html). The definitions file is a work-in-progress and additional trait values can be added if needed to capture the exact meaning you intended.
* **Data sourced from others:** For numerical traits, AusTraits strives to only include data collected by you for this project, to avoid having multiple entries of the same measurement/observation. If you have certain trait values that were sourced from the literature, an online database, or colleagues, please indicate that clearly. If trait values for some species were collected by you and others were sourced, it is very helpful if you could add a column to your spreadsheet that indicates the source for different rows of data.
83 changes: 0 additions & 83 deletions .github/workflows/R-CMD-check.yaml

This file was deleted.

8 changes: 3 additions & 5 deletions .github/workflows/check-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,13 @@ jobs:

- name: check sources
run: |
library(austraits.build)
source("scripts/custom.R")
library(traits.build)
source("R/custom_R_code.R")
dataset_test(dir("data"))
shell: Rscript {0}

- name: build austraits
run: |
library(austraits.build)
source("scripts/custom.R")
remake::make()
source("build.R")
shell: Rscript {0}

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.remake
remake.yml
export
.Rproj.user
.DS_Store
Expand All @@ -13,7 +14,7 @@ temp
.local/
.config/
.vs/
*.Rproj
man/*
tmp*
reports
data_*.csv
Expand All @@ -27,6 +28,7 @@ waiting_to_build
ignore
inst/doc
doc
docs
Meta
config/APC/*
config/NSL/*
Expand Down
45 changes: 7 additions & 38 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,61 +1,30 @@
Type: Package
Type: Compendium
Package: austraits.build
Title: Package used to build an AusTraits data resource
Title: Reprository used to build an AusTraits data resource
Version: 0.9.0
Maintainer: Daniel Falster <[email protected]>
Authors@R: c(
person(given = "Daniel", family = "Falster", role = c("cre", "aut"), email = "[email protected]", comment = c(ORCID = "0000-0002-9814-092X")),
person(given = "Elizabeth", family = "Wenk", role = c("cur", "aut"), comment = c(ORCID = "0000-0001-5640-5910")),
person(given = "Rachael", family = "Gallagher", role = c("aut", "cur"), comment = c(ORCID = "0000-0002-4680-8115")),
person(given = "Gary", family = "Truong", role = c("ctb")),
person(given = "Stuart", family = "Allen", role = c("ctb")),
person("ARDC", role = c("fnd")),
person("ARC", role = c("fnd"))
)
Description: This package enbales harmonising of data from diverse sources. The code was originally built to support AusTraits, an open-source compilation of data on the traits of Australian plant species. For more information on AusTraits go to https://austraits.org.
Description: This compendium compiles the AusTraits database, an open-source compilation of data on the traits of Australian plant species (see Falster et al 2021, <doi:10.1038/s41597-021-01006-6>). For more information on AusTraits go to https://austraits.org.
BugReports: https://github.com/traitecoevo/austraits.build/issues
URL: http://traitecoevo.github.io/austraits.build/
License: BSD_2_clause + file LICENCE
Depends:
R (>= 3.6.0),
R (>= 4.2.0),
base,
traits.build (>= 1.0.1),
dplyr,
lubridate,
readr,
stringr,
tidyr
Imports:
crayon,
git2r,
kableExtra,
magrittr,
purrr,
RefManageR,
remake,
rlang,
rmarkdown,
stringi,
styler,
testthat,
tibble,
whisker,
yaml
Suggests:
austraits,
leaflet,
bibtex,
knitr,
bench,
devtools,
markdown,
rprojroot,
pkgdown,
rcrossref,
zip,
covr
furrr
Remotes:
traitecoevo/austraits@develop,
richfitz/remake
traitecoevo/[email protected]
Encoding: UTF-8
VignetteBuilder: knitr
RoxygenNote: 7.2.3
Expand Down
44 changes: 0 additions & 44 deletions Dockerfile

This file was deleted.

Loading
Loading