From 9da74e32258c0be2be3c32ae2bd825c7c8917562 Mon Sep 17 00:00:00 2001 From: Thomas Nicholas Date: Thu, 28 Oct 2021 19:31:43 -0400 Subject: [PATCH 1/4] removed lock kwarg from zarra backend --- xarray/backends/zarr.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xarray/backends/zarr.py b/xarray/backends/zarr.py index d8548ca702f..b612e26085b 100644 --- a/xarray/backends/zarr.py +++ b/xarray/backends/zarr.py @@ -814,15 +814,7 @@ def open_dataset( chunk_store=None, storage_options=None, stacklevel=3, - lock=None, ): - # TODO remove after v0.19 - if lock is not None: - warnings.warn( - "The kwarg 'lock' has been deprecated for this backend, and is now " - "ignored. In the future passing lock will raise an error.", - DeprecationWarning, - ) filename_or_obj = _normalize_path(filename_or_obj) store = ZarrStore.open_group( From d4e5b74c20e2e5f550a17c658b1e83d3260da552 Mon Sep 17 00:00:00 2001 From: Thomas Nicholas Date: Thu, 28 Oct 2021 19:32:41 -0400 Subject: [PATCH 2/4] remove lock kwarg from pydap backend --- xarray/backends/pydap_.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/xarray/backends/pydap_.py b/xarray/backends/pydap_.py index bc479f9a71d..ffaf3793928 100644 --- a/xarray/backends/pydap_.py +++ b/xarray/backends/pydap_.py @@ -1,5 +1,3 @@ -import warnings - import numpy as np from ..core import indexing @@ -126,15 +124,7 @@ def open_dataset( use_cftime=None, decode_timedelta=None, session=None, - lock=None, ): - # TODO remove after v0.19 - if lock is not None: - warnings.warn( - "The kwarg 'lock' has been deprecated for this backend, and is now " - "ignored. In the future passing lock will raise an error.", - DeprecationWarning, - ) store = PydapDataStore.open( filename_or_obj, From 6c9e8ac9d17546eecdfca4045aba9055b85609e5 Mon Sep 17 00:00:00 2001 From: Thomas Nicholas Date: Thu, 28 Oct 2021 19:34:33 -0400 Subject: [PATCH 3/4] whatsnew --- doc/whats-new.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 9811ab0163a..7eda95d4e3a 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -67,6 +67,8 @@ Deprecations - :py:meth:`xarray.open_mfdataset` will now error instead of warn when a value for ``concat_dim`` is passed alongside ``combine='by_coords'``. By `Tom Nicholas `_. +- Removed the lock kwarg from the zarr and pydap backends, completing the deprecation cycle started in :issue:`5256`. + By `Tom Nicholas `_. Bug fixes ~~~~~~~~~ From ce266b5ac23cf6924a38acfa6594f12459ab19bb Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Wed, 29 Dec 2021 12:59:57 +0100 Subject: [PATCH 4/4] Update whats-new.rst --- doc/whats-new.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 4972e60f117..f991a4e2a89 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -31,6 +31,8 @@ Breaking changes Deprecations ~~~~~~~~~~~~ +- Removed the lock kwarg from the zarr and pydap backends, completing the deprecation cycle started in :issue:`5256`. + By `Tom Nicholas `_. Bug fixes @@ -202,8 +204,6 @@ Deprecations - :py:meth:`xarray.open_mfdataset` will now error instead of warn when a value for ``concat_dim`` is passed alongside ``combine='by_coords'``. By `Tom Nicholas `_. -- Removed the lock kwarg from the zarr and pydap backends, completing the deprecation cycle started in :issue:`5256`. - By `Tom Nicholas `_. Bug fixes ~~~~~~~~~