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

simplfying data download and adding a trycatch #169

Merged
merged 9 commits into from
Nov 13, 2023

Conversation

wcornwell
Copy link
Contributor

Simplifying data download to make server errors less likely, and adding a trycatch for the download step.

ehwenk and others added 6 commits October 31, 2023 11:43
For APC taxa, the scientific_name_id was the scientific_name_id  for the aligned name, not the accepted_name. This was because scientific_name_id  was merged in too early - it has been fixed.
* map in APNI genera

We'd initially made the decision that the genus-column would remain blank if the genus wasn't APC-accepted. For AusTraits at least this is odd - as there are 100's of entries with a taxon name, scientific name, scientific name identifier, but no genus.
Fix how a "genus" is identified within a taxon name

- For hybrid genera the genus name is "x genus" - this was causing problems in AusTraits, because I'd only included an ifelse to hunt for "x" in some places

- As part of this fix, package `extract_genus` into its own function
@wcornwell wcornwell requested a review from fontikar November 12, 2023 04:59
Copy link
Collaborator

@fontikar fontikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is removing contentid completely a good move? @wcornwell @dfalster? I think this is a good intermediate solution to stay on CRAN until we figure out contentid properly. thoughts?

@wcornwell
Copy link
Contributor Author

wcornwell commented Nov 12, 2023

until the data is in more than one place, I don't think contentID functionality makes sense? Once APC has a canonical place also, then we can revisit? Do you want to merge some of your changes in @fontikar ?

@dfalster
Copy link
Member

I agree with Will!

@fontikar
Copy link
Collaborator

until the data is in more than one place, I don't think contentID functionality makes sense? Once APC has a canonical place also, then we can revisit? Do you want to merge some of your changes in @fontikar ?

@wcornwell can I change the merging base into develop, that way you can merge that in and I can merge my changes in from graceful into develop seperately

@wcornwell
Copy link
Contributor Author

@fontikar do whatever makes sense to you! many options

@fontikar fontikar changed the base branch from master to develop November 12, 2023 23:57
Copy link
Collaborator

@fontikar fontikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice and simply changes to keep us on CRAN. Squash and merge away!

@wcornwell wcornwell merged commit 607a952 into develop Nov 13, 2023
@wcornwell wcornwell deleted the simplifydataloading branch November 13, 2023 00:11
fontikar added a commit that referenced this pull request Nov 15, 2023
* Added trigger for R CMD check for develop

* simplfying data download and adding a trycatch, removing contentid for the short term and simplifying data download  (#169)
---------

Co-authored-by: Elizabeth Wenk <[email protected]>
Co-authored-by: Fonti Kar <[email protected]>

* Graceful testing for load_taxonomic_resources (#164)

* Added dummy variable to test if network connection is down

* Refined testing for no network

* Bumped version and news

---------

Co-authored-by: Will Cornwell <[email protected]>
Co-authored-by: Elizabeth Wenk <[email protected]>
fontikar added a commit that referenced this pull request Nov 16, 2023
* simplfying data download and adding a trycatch (#169)  removing contentid for the short term and simplifying data download.

* Graceful testing for load_taxonomic_resources (#164)

* Add GitHub links to DESCRIPTION

* Updated hex #81

* NEWS updates and CRAN comments, Reverse dependency comments

* Updated documentation for create_taxonomic_update_lookup #168

* Minor updates to documentation for resources argument

* Minor documentation changes

---------

Co-authored-by: Will Cornwell <[email protected]>
Co-authored-by: Elizabeth Wenk <[email protected]>
Co-authored-by: Fonti Kar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants