Skip to content

Fix test suite with pandas 0.23 #2136

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
shoyer merged 2 commits into from
May 16, 2018
Merged

Fix test suite with pandas 0.23 #2136

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
36a34e7
Fix test suite with pandas 0.23
shoyer May 16, 2018
03db015
Disable -OO check
shoyer May 16, 2018
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
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ install:
- python xarray/util/print_versions.py

script:
- python -OO -c "import xarray"
# TODO: restore this check once the upstream pandas issue is fixed:
# https://github.com/pandas-dev/pandas/issues/21071
# - python -OO -c "import xarray"
- if [[ "$CONDA_ENV" == "docs" ]]; then
conda install -c conda-forge sphinx sphinx_rtd_theme sphinx-gallery numpydoc;
sphinx-build -n -j auto -b html -d _build/doctrees doc _build/html;
Expand Down
4 changes: 3 additions & 1 deletion xarray/tests/test_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,9 @@ def test_drop_index_labels(self):
expected = data.isel(x=slice(0, 0))
assert_identical(expected, actual)

with pytest.raises(ValueError):
# This exception raised by pandas changed from ValueError -> KeyError
# in pandas 0.23.
with pytest.raises((ValueError, KeyError)):
# not contained in axis
data.drop(['c'], dim='x')

Expand Down