Intake Take2 #233
Merged
Intake Take2 #233
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
…environments for take2
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## 187-correctness-checks #233 +/- ##
=======================================================
Coverage 96.36% 96.36%
=======================================================
Files 9 9
Lines 688 688
=======================================================
Hits 663 663
Misses 25 25 ☔ View full report in Codecov by Sentry. |
rbeucher
approved these changes
Oct 28, 2024
|
Merging this. It look good and will not introduce any major change. |
rbeucher
pushed a commit
that referenced
this pull request
Oct 28, 2024
* - Added some optional test dependencies to pyproject.toml to make runnings tests easier - Added tests to make sure taht we are parsing netCDF files as expected using intake-esm by comparing against a dataset read in directly with xarray (with same additional logic intake-esm uses) - All tests passing when coordinate variable discovery enabled - test_parsed_ncfile_values_0 failing when coordinate discovery disabled * Remove redundant breakpoint * Condensed duplicate tests * * Added tox config to test migration to 2.0.7 * Added dynamic xfail setting - necessary to ensure that we are correctly determining whether tests should pass or fail based on whether we are using latest intake-esm release or ACCESS-NRI modified version with coord variable detection. Uses a pytest_collection_modifyitems function to create xfails for tests which should fail Merge 226 editable install (#228) * Updated the way that the location of the catalog.yaml file is discovered to work in both editable & regular installations * Changed ci.yml to run tests in a default, rathe than editable installation * Updated pyproject.toml & .github/workflows/ci.yl to ensure correct coverage issues running tests using regular installation rather than editable * Added explicit test for metadata_template - must have previously been implicitly run * Changed ox.environ.get('XFAILS', default) from default='' to default=0 to fix integer conversion error if environment variables not specified. * - Final tox.ini set up, with as sensible factoring as possible - Relaxed intake version on pyproject.toml to >0.7 - Updated conftest to emit a warning if coordinate discovery is disabled (ie. wrong intake-esm version) and no environment variable is set to inform pytest this is the case * Removed some unnecessary dependencies from .[test], updated warning call in conftest to use keyword arguments rather than positional, updated comments in test_parse_access_ncfile to be more descriptive * Added python3.9 to tox.ini * Removed python3.9 again (not supported by intake-esm) * Repinned intake to 0.7.0 * Changes xfails explanation to be more terse * Made _get_xfail() docstr clearer * Intake Take2 (#233) * Rebased 153 onto 187 * gelaxed intake version on pyproject.toml to >0.7 (take2) & added tox environments for take2
This was referenced Oct 28, 2024
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.
This branch contains expanded testing to ensure a smooth update to intake take2.
It won't exactly close #153, as it doesn't pin the intake version to >=2.0.0, but it:
pyproject.tomlto allow for versions greater than 0.7.0, reverting Pin intake=0.7.0 #154.There are no indications from any test environments/configurations that intake take2 causes any issues: all tests are passing, with:
test_builders.py::test_parse_access_ncfile[AccessOm2Builder-access-om2/output000/ocean/ocean_grid.nc-expected0-True]when coordinate variable discovery is not enabled in intake-esmI haven't added any tox runs to CI, again due to expense of running it (see #232), but I'm now confident that we can reproducibly test against multiple intake versions.
intake-esmis currently pinned to 0.7.0, relaxing allowed versions ofintakewill lead to dependency resolver usingintake==0.7.0anyway,intake-esmis updated to allowintake>=0.7.0.