From 93e410bf049b25788aaf49dd92a2bf612e2618f4 Mon Sep 17 00:00:00 2001 From: Miguel Jimenez Date: Wed, 21 Aug 2024 18:25:33 -0700 Subject: [PATCH] `numpy 2` compatibility in the `pydap` backend (#9391) * re instate `pydap` to CI * include description on `what is new` * re-instate testing pydap * move whats new docs entry from `bug fixes` to `internal changes` --- ci/install-upstream-wheels.sh | 2 -- ci/requirements/all-but-dask.yml | 2 +- ci/requirements/environment-windows.yml | 2 +- ci/requirements/environment.yml | 2 +- doc/whats-new.rst | 3 +++ 5 files changed, 6 insertions(+), 5 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 \ 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 diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 2cf2d5928bf..e7f290dae16 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -60,6 +60,9 @@ Documentation Internal Changes ~~~~~~~~~~~~~~~~ +- Re-enable testing ``pydap`` backend with ``numpy>=2`` (:pull:`9391`). + By `Miguel Jimenez `_ . + .. _whats-new.2024.07.0: