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

ReadData updates #83

Merged
merged 22 commits into from
Apr 15, 2022
Merged

ReadData updates #83

merged 22 commits into from
Apr 15, 2022

Conversation

claireh93
Copy link
Member

@claireh93 claireh93 commented Sep 28, 2021

A few simple changes to read functions.

Closes #85

Co-authored-by: Richard Reeve <[email protected]>
(cherry picked from commit d2c6a93)
@claireh93
Copy link
Member Author

@richardreeve do we think we are ready to release v0.1.3 after this goes through? I need it in order for the Pluto notebooks to work

@coveralls
Copy link

coveralls commented Sep 28, 2021

Pull Request Test Coverage Report for Build 2172848642

  • 10 of 12 (83.33%) changed or added relevant lines in 2 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.05%) to 65.4%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/ClimatePref/ReadData.jl 5 6 83.33%
src/Dist.jl 5 6 83.33%
Files with Coverage Reduction New Missed Lines %
src/Dist.jl 1 89.19%
Totals Coverage Status
Change from base Build 1196793281: 0.05%
Covered Lines: 1686
Relevant Lines: 2578

💛 - Coveralls

@codecov
Copy link

codecov bot commented Sep 28, 2021

Codecov Report

Merging #83 (318fd6e) into main (07408b6) will increase coverage by 0.05%.
The diff coverage is 83.33%.

@@            Coverage Diff             @@
##             main      #83      +/-   ##
==========================================
+ Coverage   73.20%   73.25%   +0.05%     
==========================================
  Files          26       26              
  Lines        2000     2004       +4     
==========================================
+ Hits         1464     1468       +4     
  Misses        536      536              
Impacted Files Coverage Δ
src/Dist.jl 89.18% <83.33%> (+0.61%) ⬆️
src/units.jl 100.00% <0.00%> (ø)
src/EcoSISTEM.jl 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 07408b6...318fd6e. Read the comment docs.

@richardreeve
Copy link
Member

richardreeve commented Sep 28, 2021

@claireh93 - I'm happy for this to merge, and for you to release 0.1.3.

However, maybe first I've also discovered something really cool to fix our problems with examples not working with the current dev EcoSISTEM git version of the code on other people's machines - the problem is either you have no manifest in the examples folder and it installs the latest release, or you have one and the path is for your computer so doesn't work for others. Anyway, the solution is:

pkg> activate examples/Biodiversity

(Biodiversity) pkg> add .

This doesn't change the Project.toml, but creates a Manifest.toml with the relative path in it:

repo-url = "../.."

And that works on anyone's machine! Cool, eh? Anyway, I thought you might want to add in the manifests into examples/Biodiversity and anywhere else, so everything worked with relative paths? Just a thought, and we will have to remember to update them, but I do find it v annoying that we couldn't reliably run examples in live repos rather than releases... either way, you could just release 0.1.3 now. I'm not that fussed. Just remember to update the NEWS.md as well as the Project.toml.

@claireh93
Copy link
Member Author

@richardreeve that's cool! I'd like to add that in before we release 0.1.3 then

@richardreeve
Copy link
Member

Incidentally, you get slightly different Manifests depending on whether you type add . or dev . and I'm not really sure which one is best - they both seem to work?

@richardreeve
Copy link
Member

I think maybe dev . is better because it doesn't include this:

git-tree-sha1 = "29c67a69573fa38c8c4e415bcbf6efef3e17736e"

which may break when you do additional commits to the repo.

@claireh93
Copy link
Member Author

@richardreeve could you check these work on your machine please?

@richardreeve
Copy link
Member

Found a couple of missing dependencies in the examples folder... it would be good to automatically run at least examples/exampleModels.jl in the CI if we can work out how to do it?

@richardreeve
Copy link
Member

richardreeve commented Sep 30, 2021

Okay @claireh93, that works for me now, but you may want to check it again!

@claireh93
Copy link
Member Author

Found a couple of missing dependencies in the examples folder... it would be good to automatically run at least examples/exampleModels.jl in the CI if we can work out how to do it?

Yes I think that sounds like a good plan, I'll have a go at that this afternoon - then at least we know the loading of the examples works for people!

@claireh93
Copy link
Member Author

@richardreeve I have added a test to the examples folder so that we know it can build (exampleModels.jl takes too long to run). However, it seems like worldclim is down, so tests are currently failing

@richardreeve
Copy link
Member

Okay @claireh93 - the site is still down, so let's just wait until it's up to check everything is working...

Copy link
Member

@richardreeve richardreeve left a comment

Choose a reason for hiding this comment

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

Just fiddling with this because I need to start looking at PRs again and I just thought I'd start with some tidying. Feel free to ignore if you don't like it!

test/canonical/test_biodiversity.jl Outdated Show resolved Hide resolved
test/canonical/test_biodiversity.jl Outdated Show resolved Hide resolved
test/canonical/test_biodiversity.jl Outdated Show resolved Hide resolved
test/canonical/test_biodiversity.jl Outdated Show resolved Hide resolved
examples/test_examples.jl Outdated Show resolved Hide resolved
test/runtests.jl Outdated Show resolved Hide resolved
examples/test_examples.jl Outdated Show resolved Hide resolved
examples/test_examples.jl Outdated Show resolved Hide resolved
test/runtests.jl Outdated Show resolved Hide resolved
@claireh93 claireh93 merged commit f5facf0 into main Apr 15, 2022
@claireh93 claireh93 deleted the claireh93/main-updates-again branch April 15, 2022 14:40
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.

Examples folder untested
3 participants