Remerge main into dev #57
Merged
Conversation
This file contains 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
…warnings. (cherry picked from commit 5d4ae82)
Pre-release updates
Add authors and version number.
…oSISTEM.jl into claireh93/pre-release
Get package ready for 0.1.0.
Update testing urls.
Fix urls in docs.
Add compat entry for Julia
Minor fixes to dependencies
Fix license
Fix phylogenetic diversity handling
…lper/new_version/2021-04-21-13-09-47-070-2756956167 * commit '499d77df978997897694fe99400d1bb6e1df7b0f': CompatHelper: add new compat entry for "Conda" at version "1.5"
…lper/new_version/2021-04-21-13-09-47-070-2756956167 * commit 'e51eb3ec1d038f05536615439f3d765f7b5aa567': CompatHelper: add new compat entry for "SQLite" at version "1.1"
…lper/new_version/2021-04-21-13-09-47-070-2756956167 * commit 'af9000874f968b8e728d62adc7fb54980848a70a': CompatHelper: add new compat entry for "OnlineStatsBase" at version "1.4"
…lper/new_version/2021-04-21-13-09-47-070-2756956167 * commit 'fa783a6f7555d5533392726d5ea880a328e013d8': CompatHelper: add new compat entry for "ORCA" at version "0.5"
…lper/new_version/2021-04-21-13-09-47-070-2756956167 * commit '392eb722af05ac05077eab56a6f3cb2d76b91988': CompatHelper: add new compat entry for "DataRegistryUtils" at version "0.50"
…lper/new_version/2021-04-21-13-09-47-070-2756956167 * commit '9bfcfdda0f8f9ea99d843b19d8254e0bb4bf63e9': CompatHelper: add new compat entry for "Revise" at version "3.1" # Conflicts: # Project.toml
…lper/new_version/2021-04-21-13-09-47-070-2756956167 * commit 'e81b269b70a0a9601e64a02970a1a8821c07df2b': CompatHelper: bump compat for "Missings" to "1.0"
…lper/new_version/2021-04-21-13-09-47-070-2756956167 * commit 'bd88bae37a68b70de9b028e82dd3f19dd88795c3': CompatHelper: bump compat for "DataFrames" to "1.0" # Conflicts: # Project.toml
…070-2756956167 * dev: (46 commits) Add errors for NoMovement and PathogenTypes. Distinguish gettraits into getspeciestraits and getpathogen traits. Update traitfun to accept a SpeciesType or PathogenType. Add movement testing. Update examples. Update src/Transitions/Transitions.jl Update docs for transition types. Update src/Transitions/Transitions.jl Update src/Biodiversity/MPIGenerate.jl Update src/Epidemiology/EpiGenerate.jl Update src/Epidemiology/EpiGenerate.jl Update src/Epidemiology/shrink.jl Update src/EcoSISTEM.jl Simplify simulate functions. Change update! -> biodiversity_update! for MPIEcosystems. Change helper funs back to run on AbstractEcosystem for MPI. Minor fixes. Some weird things going on with example runs - deleting duplicated files after merge. Update src/Biodiversity/Generate.jl Update examples/sir_transitions.jl A few light changes to helper funs. ... # Conflicts: # Manifest.toml
…rsion/2021-04-21-13-09-47-070-2756956167 CompatHelper: add new merged compat entries
Codecov Report
@@ Coverage Diff @@
## dev #57 +/- ##
=======================================
Coverage 80.04% 80.04%
=======================================
Files 44 44
Lines 2691 2691
=======================================
Hits 2154 2154
Misses 537 537
Continue to review full report at Codecov.
|
Pull Request Test Coverage Report for Build 785756007
💛 - Coveralls |
|
@richardreeve things went well with the merge to SCRC so I think we are ready for this one to go through. |
richardreeve
approved these changes
Apr 27, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Updated Zenodo file for correct author list and otherwise merging changes from
mainas is.