From 1e6b2b00c1b75803609a92783bcec80a36c83b08 Mon Sep 17 00:00:00 2001 From: "Miguel A. Jimenez-Urias" Date: Wed, 21 Aug 2024 09:53:48 -0700 Subject: [PATCH 1/4] re instate `pydap` to CI --- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index 119db282ad9..2f47643cc87 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -27,7 +27,7 @@ dependencies: - pandas - pint>=0.22 - pip - # - pydap + - pydap - pytest - pytest-cov - pytest-env diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index 896e390ea3e..3b2e6dc62e6 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -29,7 +29,7 @@ dependencies: # - pint>=0.22 - pip - pre-commit - # - pydap + - pydap - pytest - pytest-cov - pytest-env diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 40ef4a7fc74..865c2fd9b19 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -35,7 +35,7 @@ dependencies: - pooch - pre-commit - pyarrow # pandas raises a deprecation warning without this, breaking doctests - # - pydap + - pydap - pytest - pytest-cov - pytest-env From d620b396ce0438121f6074f938943dbde9a1db0c Mon Sep 17 00:00:00 2001 From: "Miguel A. Jimenez-Urias" Date: Wed, 21 Aug 2024 10:04:08 -0700 Subject: [PATCH 2/4] include description on `what is new` --- doc/whats-new.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index e4ffc5ca799..797c0850957 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -50,6 +50,8 @@ Bug fixes - Fix issue with passing parameters to ZarrStore.open_store when opening datatree in zarr format (:issue:`9376`, :pull:`9377`). By `Alfonso Ladino `_ +- ``numpy>=2`` compatibility in the ``pydap`` backend (:pull:`9391`). + By `Miguel Jimenez `_ . Documentation ~~~~~~~~~~~~~ From 3695fc89732906292311718b7c59542b39cd1cfe Mon Sep 17 00:00:00 2001 From: "Miguel A. Jimenez-Urias" Date: Wed, 21 Aug 2024 11:11:13 -0700 Subject: [PATCH 3/4] re-instate testing pydap --- ci/install-upstream-wheels.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index 855336ad8bd..af8a21c1dbb 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -12,8 +12,6 @@ fi $conda remove -y numba numbagg sparse # temporarily remove numexpr $conda remove -y numexpr -# temporarily remove backends -$conda remove -y pydap # forcibly remove packages to avoid artifacts $conda remove -y --force \ numpy \ From efbfc337c069662fe1fd423ddf5969498f426b7f Mon Sep 17 00:00:00 2001 From: "Miguel A. Jimenez-Urias" Date: Wed, 21 Aug 2024 11:12:29 -0700 Subject: [PATCH 4/4] move whats new docs entry from `bug fixes` to `internal changes` --- doc/whats-new.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 797c0850957..83260f6dda1 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -50,8 +50,6 @@ Bug fixes - Fix issue with passing parameters to ZarrStore.open_store when opening datatree in zarr format (:issue:`9376`, :pull:`9377`). By `Alfonso Ladino `_ -- ``numpy>=2`` compatibility in the ``pydap`` backend (:pull:`9391`). - By `Miguel Jimenez `_ . Documentation ~~~~~~~~~~~~~ @@ -60,6 +58,9 @@ Documentation Internal Changes ~~~~~~~~~~~~~~~~ +- Re-enable testing ``pydap`` backend with ``numpy>=2`` (:pull:`9391`). + By `Miguel Jimenez `_ . + .. _whats-new.2024.07.0: