Skip to content

un-xfail tests that append to netCDF files with scipy #3805

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

Merged
merged 5 commits into from
Mar 9, 2020
Merged

un-xfail tests that append to netCDF files with scipy #3805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5097155
remove ScipyWriteBase class
mathause Feb 27, 2020
b8b1118
Merge branch 'master' into un-xfail-scipy-append-errors
mathause Mar 5, 2020
9b781ff
Merge branch 'master' into un-xfail-scipy-append-errors
mathause Mar 6, 2020
7ede911
add whats new
mathause Mar 6, 2020
63f1efb
Merge branch 'master' into un-xfail-scipy-append-errors
dcherian Mar 9, 2020
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
2 changes: 2 additions & 0 deletions doc/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Internal Changes
By `Bruno Pagani <https://github.com/ArchangeGabriel>`_.
- Updated Azure CI MacOS image, given pending removal.
By `Maximilian Roos <https://github.com/max-sixty>`_
- Removed xfails for scipy 1.0.1 for tests that append to netCDF files (:pull:`3805`).
By `Mathias Hauser <https://github.com/mathause>`_.
- Removed conversion to :py:class:`pandas.Panel`, given its removal in pandas
in favor of xarray's objects.
By `Maximilian Roos <https://github.com/max-sixty>`_
Expand Down
24 changes: 4 additions & 20 deletions xarray/tests/test_backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1979,24 +1979,8 @@ def create_zarr_target(self):
yield tmp


class ScipyWriteBase(CFEncodedBase, NetCDF3Only):
def test_append_write(self):
import scipy

if scipy.__version__ == "1.0.1":
pytest.xfail("https://github.com/scipy/scipy/issues/8625")
super().test_append_write()

def test_append_overwrite_values(self):
import scipy

if scipy.__version__ == "1.0.1":
pytest.xfail("https://github.com/scipy/scipy/issues/8625")
super().test_append_overwrite_values()


@requires_scipy
class TestScipyInMemoryData(ScipyWriteBase):
class TestScipyInMemoryData(CFEncodedBase, NetCDF3Only):
engine = "scipy"

@contextlib.contextmanager
Expand All @@ -2017,7 +2001,7 @@ def test_bytes_pickle(self):


@requires_scipy
class TestScipyFileObject(ScipyWriteBase):
class TestScipyFileObject(CFEncodedBase, NetCDF3Only):
engine = "scipy"

@contextlib.contextmanager
Expand Down Expand Up @@ -2050,7 +2034,7 @@ def test_pickle_dataarray(self):


@requires_scipy
class TestScipyFilePath(ScipyWriteBase):
class TestScipyFilePath(CFEncodedBase, NetCDF3Only):
engine = "scipy"

@contextlib.contextmanager
Expand Down Expand Up @@ -3317,7 +3301,7 @@ def test_session(self):

@requires_scipy
@requires_pynio
class TestPyNio(ScipyWriteBase):
class TestPyNio(CFEncodedBase, NetCDF3Only):
def test_write_store(self):
# pynio is read-only for now
pass
Expand Down