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

Pass combine_attrs arguments for compatibility with xarray-0.18; bump to xarray-0.17.0, Python 3.7 #199

Merged
merged 2 commits into from
Jun 9, 2021

Conversation

johnomotani
Copy link
Collaborator

Need to pass combine_attrs arguments explicitly in a couple of places, otherwise tests fail with the most recent release of xarray. The new arguments require bumping the minimum supported version of xarray to 0.17.0, which requires bumping the minimum Python version to 3.7.

@johnomotani johnomotani added the bugfix Fix for a bug label Jun 8, 2021
@johnomotani johnomotani changed the title Pass combine_attrs arguments for compatibilty with xarray-0.18; bump to xarray-0.17.0, Python 3.7 Pass combine_attrs arguments for compatibility with xarray-0.18; bump to xarray-0.17.0, Python 3.7 Jun 8, 2021
@johnomotani johnomotani force-pushed the xarray-0.18-compatibility branch from 5577aab to 3433d62 Compare June 8, 2021 17:40
xarray>=0.17.0 is required to use combine_attrs="drop_conflicts".
xarray-0.17.0 does not support Python-3.6, so increase minimum Python
version to 3.7.
@johnomotani johnomotani force-pushed the xarray-0.18-compatibility branch from 3433d62 to becd461 Compare June 8, 2021 17:51
@codecov-commenter
Copy link

codecov-commenter commented Jun 8, 2021

Codecov Report

Merging #199 (becd461) into master (8f14cb2) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #199   +/-   ##
=======================================
  Coverage   74.61%   74.61%           
=======================================
  Files          14       14           
  Lines        2600     2600           
  Branches      617      617           
=======================================
  Hits         1940     1940           
  Misses        428      428           
  Partials      232      232           
Impacted Files Coverage Δ
xbout/load.py 78.15% <ø> (ø)
xbout/boutdataarray.py 76.85% <100.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 8f14cb2...becd461. Read the comment docs.

@johnomotani johnomotani requested a review from ZedThree June 8, 2021 19:49
@johnomotani johnomotani merged commit 2c96869 into master Jun 9, 2021
@johnomotani johnomotani deleted the xarray-0.18-compatibility branch June 9, 2021 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Fix for a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants