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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f21a968
Pass 'combine_attrs' arguments for compatibility with xarray-0.18
johnomotani Jun 8, 2021
becd461
Bump minimum required version of xarray to 0.17.0 and Python to 3.7
johnomotani Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
if: always()
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: [3.7, 3.8]
pip-packages:
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray!=0.14.0 numpy>=1.16.0"
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.16.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.17.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
fail-fast: false

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pythonpackage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
if: always()
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: [3.7, 3.8]
pip-packages:
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray!=0.14.0 numpy>=1.16.0"
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.16.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.17.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
fail-fast: false

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pythonpublish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
if: always()
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: [3.7, 3.8]
pip-packages:
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray!=0.14.0 numpy>=1.16.0"
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.16.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.17.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
fail-fast: true

steps:
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ build:
image: latest

python:
version: 3.6
version: 3.8
pip_install: true
extra_requirements:
- docs
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ author = Thomas Nicholas
author_email = [email protected]
description = Collect data from BOUT++ runs in python using xarray
license = Apache
python_requires = >=3.6
python_requires = >=3.7
long_description = file: README.md
long_description_content_type = text/markdown
classifiers =
Expand All @@ -27,7 +27,7 @@ setup_requires =
setuptools_scm[toml]>=3.4
setuptools_scm_git_archive
install_requires =
xarray>=0.16.0
xarray>=0.17.0
boutdata>=0.1.2
dask[array]>=2.10.0
natsort>=5.5.0
Expand Down
2 changes: 1 addition & 1 deletion xbout/boutdataarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def interpolate_parallel(
if "region" in part[self.data.name].attrs:
del part[self.data.name].attrs["region"]

result = xr.combine_by_coords(parts)
result = xr.combine_by_coords(parts, combine_attrs="drop_conflicts")

if return_dataset:
return result
Expand Down
1 change: 1 addition & 0 deletions xbout/load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ def _auto_open_mfboutdataset(
concat_dim=concat_dims,
data_vars=_BOUT_TIME_DEPENDENT_META_VARS,
join="exact",
combine_attrs="no_conflicts",
)

# Remove any duplicate time values from concatenation
Expand Down