Skip to content

Fixes for pytest-8.0.0 compatibility #8686

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

Merged
merged 3 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion ci/requirements/all-but-dask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
- pint>=0.22
- pip
- pydap
- pytest==7.4.*
- pytest
- pytest-cov
- pytest-env
- pytest-xdist
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/bare-minimum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.9
- coveralls
- pip
- pytest==7.4.*
- pytest
- pytest-cov
- pytest-env
- pytest-xdist
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/environment-3.12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:
- pooch
- pre-commit
- pydap
- pytest==7.4.*
- pytest
- pytest-cov
- pytest-env
- pytest-xdist
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/environment-windows-3.12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
- pip
- pre-commit
- pydap
- pytest==7.4.*
- pytest
- pytest-cov
- pytest-env
- pytest-xdist
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/environment-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
- pip
- pre-commit
- pydap
- pytest==7.4.*
- pytest
- pytest-cov
- pytest-env
- pytest-xdist
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies:
- pre-commit
- pyarrow # pandas makes a deprecation warning without this, breaking doctests
- pydap
- pytest==7.4.*
- pytest
- pytest-cov
- pytest-env
- pytest-xdist
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/min-all-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies:
- pint=0.22
- pip
- pydap=3.3
- pytest==7.4.*
- pytest
- pytest-cov
- pytest-env
- pytest-xdist
Expand Down
6 changes: 2 additions & 4 deletions xarray/tests/test_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -2724,8 +2724,7 @@ def test_drop_index_labels(self) -> None:
assert_identical(data, actual)

with pytest.raises(ValueError):
with pytest.warns(DeprecationWarning):
data.drop(["c"], dim="x", errors="wrong_value") # type: ignore[arg-type]
data.drop(["c"], dim="x", errors="wrong_value") # type: ignore[arg-type]

with pytest.warns(DeprecationWarning):
actual = data.drop(["a", "b", "c"], "x", errors="ignore")
Expand Down Expand Up @@ -3159,8 +3158,7 @@ def test_rename_multiindex(self) -> None:
original.rename({"a": "x"})

with pytest.raises(ValueError, match=r"'b' conflicts"):
with pytest.warns(UserWarning, match="does not create an index anymore"):
original.rename({"a": "b"})
original.rename({"a": "b"})

def test_rename_perserve_attrs_encoding(self) -> None:
# test propagate attrs/encoding to new variable(s) created from Index object
Expand Down
2 changes: 2 additions & 0 deletions xarray/tests/test_groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ def test_groupby_dims_property(dataset, recwarn) -> None:
with pytest.warns(UserWarning, match="The `squeeze` kwarg"):
assert dataset.groupby("x").dims == dataset.isel(x=1).dims
assert dataset.groupby("y").dims == dataset.isel(y=1).dims
# in pytest-8, pytest.warns() no longer clears all warnings
recwarn.clear()

# when squeeze=False, no warning should be raised
assert tuple(dataset.groupby("x", squeeze=False).dims) == tuple(
Expand Down