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

Create generalised extract_data function #116

Closed
wants to merge 82 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
64db845
Trying out map for tests
fontikar Jan 12, 2023
7704303
Added version number to austraits_list_post
fontikar Jan 12, 2023
5e2e6a2
Added Wright_2019 in old rel test dataset so tests are consistent
fontikar Jan 12, 2023
426fc4d
Updated code to subset 4.0.0 from zenodo
fontikar Jan 12, 2023
b677567
Version testing for extract, and summarise_austriats
fontikar Jan 12, 2023
c2008c5
Combined extract_ tests and added version testing
fontikar Jan 12, 2023
5e47cfb
Version tests for join_
fontikar Jan 13, 2023
c0781b5
Version tests for widetable and renamed test files
fontikar Jan 13, 2023
50154e1
#60 fixed imports for pivot_wider, organised tests, currently not wor…
fontikar Jan 13, 2023
247db43
Minor naming adjustments in test
fontikar Jan 13, 2023
2b79ab5
Merge branch 'multi_tests' into develop: All possible tests is run th…
fontikar Jan 13, 2023
82a0f0f
Change some dependencies to imports
dfalster Jan 25, 2023
6e0cb08
Remove helper functions to vignettes
dfalster Jan 25, 2023
8f79aa6
Update deprecated functions
dfalster Jan 25, 2023
30d95cc
Restructure tests to run faster
dfalster Jan 25, 2023
9615ed0
Change GH actions triggers
dfalster Jan 25, 2023
87bdb95
ensure consistent ordering of rows
dfalster Jan 25, 2023
846ba84
Merge branch 'master' into develop
fontikar Oct 16, 2023
3564de0
bumped version number
fontikar Oct 16, 2023
4a534bf
Update to work with latest zenodo API (#81)
dfalster Oct 16, 2023
17de18c
Pulled files we want to develop from change-v5
fontikar Oct 19, 2023
f9c1666
Changes for v5 austraits.build (#78)
fontikar Nov 21, 2023
10791de
Bumped version number and updated news
fontikar Nov 21, 2023
32e5262
Added references to packages
fontikar Nov 21, 2023
a64a360
Updated version for GH steps
fontikar Nov 21, 2023
23a2f7a
Updated v number for GHA
fontikar Nov 21, 2023
147030b
Expanding testing suite to all 3 major versions of AusTraits (#86)
fontikar Nov 22, 2023
2bd66f1
Added codecov yml
fontikar Nov 22, 2023
cc8e8cf
Merge branch 'develop' of https://github.com/traitecoevo/austraits in…
fontikar Nov 22, 2023
d1c6f61
Setting limit for patch cov
fontikar Nov 22, 2023
91c94c4
Merge branch 'master' into develop
fontikar Nov 26, 2023
a541663
bumped version number for dev
fontikar Nov 26, 2023
277a7e5
API related packages to Suggests (#89)
fontikar Nov 27, 2023
9360930
Merge branch 'master' into develop
fontikar Sep 3, 2024
9d32105
Bumped version number
fontikar Sep 3, 2024
6928738
create new function `check_compatibility` (#95)
ehwenk Sep 4, 2024
4df279b
A generalised solution to deprecate `switch` functions (#100)
fontikar Sep 9, 2024
1c10ad1
Mass removal of version switches (#102)
fontikar Sep 12, 2024
20ced9a
Update documentation (#103)
ehwenk Sep 13, 2024
16d932d
Add `database_create_combined_table` & revise `join_` functions (#104)
ehwenk Sep 26, 2024
1bc40cc
Create extract_data.R
ehwenk Nov 1, 2024
b9ba3f8
Move function `bind_databases` from traits.build
ehwenk Nov 1, 2024
3d3a6d8
package documentation
ehwenk Nov 1, 2024
21297a0
Update database_create_combined_table.R
ehwenk Nov 1, 2024
93c7ee8
fix bug in `flatten_database`
ehwenk Nov 1, 2024
c1f8fff
fix bug in extract_data function
ehwenk Nov 8, 2024
887bd82
Update test-extract_.R
ehwenk Nov 8, 2024
9efaf4f
Added namespace, renamed argument and updated extract_dataset #107
fontikar Nov 8, 2024
1063bb7
Renamed argument and updated extract_trait #107
fontikar Nov 8, 2024
9724ecb
Renamed argument and updated extract_taxa #107
fontikar Nov 8, 2024
5cb4a8f
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
fontikar Nov 8, 2024
6a4e11c
Update test-extract_.R
ehwenk Nov 8, 2024
2df5fe5
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
ehwenk Nov 8, 2024
c163096
Changed fire to sapwood as there is no fire in austraits_lite.5.0.0
fontikar Nov 8, 2024
12e7ea0
fix extract_data to work if some tibbles empty
ehwenk Nov 8, 2024
5ecc10a
most remaining bugs fixed
ehwenk Nov 9, 2024
9a1891f
Reordered list from extract
fontikar Nov 10, 2024
62c9500
Sort list names at the end of function
fontikar Nov 10, 2024
2b8317c
various small fixes
ehwenk Nov 11, 2024
6858990
Updating links in function docs, added Lizzy as contributor, added br…
fontikar Nov 11, 2024
51a87fd
export `join_context_properties`
ehwenk Nov 11, 2024
75e7d49
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
ehwenk Nov 11, 2024
97b4f5f
Updating documentation to pass R CMD check, argument names renamed, a…
fontikar Nov 11, 2024
82bb532
add documentation for `extract_data`
ehwenk Nov 11, 2024
1dd7882
Added some global variables
fontikar Nov 11, 2024
78a281f
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
fontikar Nov 11, 2024
ecbd85d
Reduce line width
fontikar Nov 11, 2024
9b825af
add documention for individuals join_ functions
ehwenk Nov 11, 2024
5870716
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
ehwenk Nov 11, 2024
243ac01
Line Breaks for extract and updated gha workflow
fontikar Nov 11, 2024
70fedae
more updates to documentation
ehwenk Nov 11, 2024
6941879
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
ehwenk Nov 11, 2024
5172358
Added upload token
fontikar Nov 11, 2024
192da20
Create test-bind_databases.R
ehwenk Nov 11, 2024
50796fc
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
ehwenk Nov 11, 2024
10fa55d
All warnings gone!
fontikar Nov 11, 2024
07b1e72
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
fontikar Nov 11, 2024
c0baa49
changed `plant_trait_name` to `trait_name`
ehwenk Nov 11, 2024
81a1c06
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
ehwenk Nov 11, 2024
28208a3
Rm trigger for GHA
fontikar Nov 11, 2024
052bf47
Merge branch 'generalise_extract_off_develop' of https://github.com/t…
fontikar Nov 11, 2024
eb07fe8
Update bind_databases.R
ehwenk Nov 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
^ignore$
^austraits$
^codecov\.yml$
^inst/cheatsheet$
1 change: 0 additions & 1 deletion .github/workflows/test-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
branches:
- master
- develop
- upgrade
pull_request:
branches:
- master
Expand Down
15 changes: 11 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
Package: austraits
Title: Helpful functions to access, summarise and wrangle austraits data
Version: 2.2.3
Version: 3.0.0.9000
Authors@R:
c(person(given = "Daniel",
family = "Falster",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0002-9814-092X")),
person(given = "Elizabeth",
family = "Wenk",
role = "ctb",
email = "[email protected]",
comment = c(ORCID = "0000-0001-5640-5910")),
person(given = "Fonti",
family = "Kar",
role = c("aut", "cre"),
Expand All @@ -22,7 +27,7 @@ Encoding: UTF-8
Language: en
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
Depends:
R (>= 4.0.0),
RefManageR
Expand All @@ -32,19 +37,21 @@ Imports:
rlang,
purrr,
tidyselect,
assertthat,
stringr,
stats,
jsonlite,
utils,
magrittr,
janitor,
lifecycle
lifecycle,
tibble,
cli
Suggests:
ggplot2,
ggpointdensity,
ggbeeswarm (>= 0.7.1),
gridExtra,
readr,
scales,
forcats,
viridis,
Expand Down
28 changes: 14 additions & 14 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,25 @@
S3method(print,austraits)
export("%>%")
export(as_wide_table)
export(bind_databases)
export(bind_trait_values)
export(extract_data)
export(extract_dataset)
export(extract_taxa)
export(extract_trait)
export(flatten_database)
export(get_version_latest)
export(get_versions)
export(join_all)
export(join_contexts)
export(join_locations)
export(join_context_properties)
export(join_contributors)
export(join_location_coordinates)
export(join_location_properties)
export(join_methods)
export(join_sites)
export(join_taxonomy)
export(join_taxa)
export(join_taxonomic_updates)
export(load_austraits)
export(lookup_context_property)
export(lookup_location_property)
export(lookup_trait)
export(plot_locations)
export(plot_site_locations)
Expand All @@ -25,17 +31,11 @@ export(summarise_austraits)
export(summarise_trait_means)
export(trait_pivot_longer)
export(trait_pivot_wider)
export(util_df_to_list)
export(util_list_to_df2)
import(RefManageR)
importFrom(dplyr,arrange)
importFrom(dplyr,filter)
importFrom(dplyr,group_by)
importFrom(dplyr,select)
importFrom(dplyr,summarise)
importFrom(lifecycle,deprecated)
importFrom(magrittr,"%>%")
importFrom(rlang,.data)
importFrom(stats,family)
importFrom(stringr,str_detect)
importFrom(tidyr,pivot_longer)
importFrom(tidyr,pivot_wider)
importFrom(tidyselect,all_of)
importFrom(utils,methods)
16 changes: 15 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
# austraits 2.2.1
# austraits 3.0.0.9000
- Updated dependencies, placing graphics related packages in Suggests
- Added internal function to check the compatibility of databases
- Added internal function notify users that some database versions will not be supported
- The following functions will no longer support AusTraits version < 5.0.0:
- `extract_*`
- `trait_pivot_wider`
- `join_*`
- `plot_site/locations`
- `plot_trait_beeswarm`
- `as_wide_table`
- `trait_pivot_longer` is deprecated
- `summarise_trait_means` will trigger warning due to uninformed calculations
- Added new function `extract_data`
- Added new function `bind_databases`
- Added new function `flatten_databases`
Loading
Loading