From f086ce243129253450b7006da4ca9b05d2c7f99b Mon Sep 17 00:00:00 2001 From: Mike Sullivan Date: Tue, 23 Jul 2024 11:38:26 +0100 Subject: [PATCH 1/4] update scikit-image to 0.20.* --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index d0a9a273268..d23ef0131c4 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -19,7 +19,7 @@ requirements: - pip - astropy=6.0.* - scipy=1.14.* - - scikit-image=0.19.* + - scikit-image=0.20.* - tifffile=2023.7.18 - imagecodecs=2023.1.23 - numpy=1.26.* From 29a68dfebf70f510cbb53f8e4ca68c22eb494536 Mon Sep 17 00:00:00 2001 From: Mike Sullivan Date: Tue, 23 Jul 2024 11:39:05 +0100 Subject: [PATCH 2/4] update h5py to 3.9.* --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index d23ef0131c4..77a65e71d90 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -30,7 +30,7 @@ requirements: - cupy=12.3.* - astra-toolbox=2.0.0 - requests=2.27.* - - h5py=3.7.* + - h5py=3.9.* - psutil=5.9.* - cil=24.0.* - ccpi-regulariser From 20b1a321f96cb0e0690675f8e8eca2dccc33e766 Mon Sep 17 00:00:00 2001 From: Mike Sullivan Date: Tue, 23 Jul 2024 12:28:32 +0100 Subject: [PATCH 3/4] fix hdf5 to 1.14.2 to prevent build vs runtime conflicts for h5py --- conda/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index 77a65e71d90..45ce6b15190 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -31,6 +31,7 @@ requirements: - astra-toolbox=2.0.0 - requests=2.27.* - h5py=3.9.* + - hdf5=1.14.2 - psutil=5.9.* - cil=24.0.* - ccpi-regulariser From 004069e2404433a91826c07e55e7362f3197c429 Mon Sep 17 00:00:00 2001 From: Mike Sullivan Date: Tue, 23 Jul 2024 13:04:28 +0100 Subject: [PATCH 4/4] release note --- docs/release_notes/next/dev-2289-fix-numpy-deprecation | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/release_notes/next/dev-2289-fix-numpy-deprecation diff --git a/docs/release_notes/next/dev-2289-fix-numpy-deprecation b/docs/release_notes/next/dev-2289-fix-numpy-deprecation new file mode 100644 index 00000000000..be157c6fd91 --- /dev/null +++ b/docs/release_notes/next/dev-2289-fix-numpy-deprecation @@ -0,0 +1 @@ +#2289: updated packages to deal with numpy deprecation warnings leading towards 2.0 \ No newline at end of file