From 0961ae2f0947ab61e08e56f96efd90b4efa896ed Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 28 Nov 2022 10:08:38 -0500 Subject: [PATCH 01/13] numpy deprecation warning filter for v1.24.0 --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 9b4aa43242..80dbd469e8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -97,6 +97,7 @@ filterwarnings = ignore:distutils Version classes are deprecated:DeprecationWarning ignore:Passing unrecognized arguments to super:DeprecationWarning ignore:.*With traitlets 4\.1, metadata should be set using the \.tag\(\) method:DeprecationWarning + ignore:.*(Deprecated NumPy 1.24):DeprecationWarning ignore::DeprecationWarning:glue ignore::DeprecationWarning:bqplot ignore::DeprecationWarning:bqplot_image_gl From e9be141c5d05bba9211a016d0df8a5d6ae8d3c18 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 28 Nov 2022 10:46:23 -0500 Subject: [PATCH 02/13] Fixing np.float_ type casting --- jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py index 892011c2cd..8871aafc12 100644 --- a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py +++ b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py @@ -17,8 +17,8 @@ def jwst_header_to_skyregion(header): s_region = header['S_REGION'] footprint = s_region.split("POLYGON ICRS")[1].split() - ra = np.array(footprint[::2], dtype=np.float) - dec = np.array(footprint[1::2], dtype=np.float) + ra = np.array(footprint[::2], dtype=np.float_) + dec = np.array(footprint[1::2], dtype=np.float_) # Find center of slit cra = (max(ra) + min(ra)) / 2 From d098d2b2e8a1dde5d3f57ec6dda4249491315a3e Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 28 Nov 2022 14:02:59 -0500 Subject: [PATCH 03/13] more specific warning for pytest --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 80dbd469e8..3403f50c36 100644 --- a/setup.cfg +++ b/setup.cfg @@ -97,7 +97,7 @@ filterwarnings = ignore:distutils Version classes are deprecated:DeprecationWarning ignore:Passing unrecognized arguments to super:DeprecationWarning ignore:.*With traitlets 4\.1, metadata should be set using the \.tag\(\) method:DeprecationWarning - ignore:.*(Deprecated NumPy 1.24):DeprecationWarning + ignore:`np.bool8` is a deprecated alias for `np.bool_`. (Deprecated NumPy 1.24):DeprecationWarning ignore::DeprecationWarning:glue ignore::DeprecationWarning:bqplot ignore::DeprecationWarning:bqplot_image_gl From 7b0382cd5fe5f74074eaca5a68b384bb71960d86 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 28 Nov 2022 14:33:51 -0500 Subject: [PATCH 04/13] dodging regex failure --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 3403f50c36..ef23db1e57 100644 --- a/setup.cfg +++ b/setup.cfg @@ -97,7 +97,7 @@ filterwarnings = ignore:distutils Version classes are deprecated:DeprecationWarning ignore:Passing unrecognized arguments to super:DeprecationWarning ignore:.*With traitlets 4\.1, metadata should be set using the \.tag\(\) method:DeprecationWarning - ignore:`np.bool8` is a deprecated alias for `np.bool_`. (Deprecated NumPy 1.24):DeprecationWarning + ignore:is a deprecated alias for:DeprecationWarning ignore::DeprecationWarning:glue ignore::DeprecationWarning:bqplot ignore::DeprecationWarning:bqplot_image_gl From b53ac6bde1e982cd7a71a48c5844def3198ba166 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 28 Nov 2022 14:48:11 -0500 Subject: [PATCH 05/13] Update setup.cfg Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com> --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ef23db1e57..a1ce3b61a8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -97,7 +97,7 @@ filterwarnings = ignore:distutils Version classes are deprecated:DeprecationWarning ignore:Passing unrecognized arguments to super:DeprecationWarning ignore:.*With traitlets 4\.1, metadata should be set using the \.tag\(\) method:DeprecationWarning - ignore:is a deprecated alias for:DeprecationWarning + ignore:.*np\.bool8.*is a deprecated alias for:DeprecationWarning ignore::DeprecationWarning:glue ignore::DeprecationWarning:bqplot ignore::DeprecationWarning:bqplot_image_gl From ce92cfa0350be3a85ba1fd11f180fea39c7cbba0 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 28 Nov 2022 15:22:10 -0500 Subject: [PATCH 06/13] fixing another deprecation warning --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index a1ce3b61a8..c791121d45 100644 --- a/setup.cfg +++ b/setup.cfg @@ -98,6 +98,7 @@ filterwarnings = ignore:Passing unrecognized arguments to super:DeprecationWarning ignore:.*With traitlets 4\.1, metadata should be set using the \.tag\(\) method:DeprecationWarning ignore:.*np\.bool8.*is a deprecated alias for:DeprecationWarning + ignore:.*np\.unit0.*is a deprecated alias for:DeprecationWarning ignore::DeprecationWarning:glue ignore::DeprecationWarning:bqplot ignore::DeprecationWarning:bqplot_image_gl From dbbc5d027cac049dace3281093730e4e135e8602 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 28 Nov 2022 16:35:58 -0500 Subject: [PATCH 07/13] fixing another deprecation warning --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index c791121d45..097dec4aff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -98,7 +98,7 @@ filterwarnings = ignore:Passing unrecognized arguments to super:DeprecationWarning ignore:.*With traitlets 4\.1, metadata should be set using the \.tag\(\) method:DeprecationWarning ignore:.*np\.bool8.*is a deprecated alias for:DeprecationWarning - ignore:.*np\.unit0.*is a deprecated alias for:DeprecationWarning + ignore:.*np\.uint0.*is a deprecated alias for:DeprecationWarning ignore::DeprecationWarning:glue ignore::DeprecationWarning:bqplot ignore::DeprecationWarning:bqplot_image_gl From 3a36d6259bc964449d6ffe707e3905c5f7b86a93 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Tue, 29 Nov 2022 09:12:34 -0500 Subject: [PATCH 08/13] Adding np.int0 to filtered warnings --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 097dec4aff..cc31308c32 100644 --- a/setup.cfg +++ b/setup.cfg @@ -99,6 +99,7 @@ filterwarnings = ignore:.*With traitlets 4\.1, metadata should be set using the \.tag\(\) method:DeprecationWarning ignore:.*np\.bool8.*is a deprecated alias for:DeprecationWarning ignore:.*np\.uint0.*is a deprecated alias for:DeprecationWarning + ignore:.*np\.int0.*is a deprecated alias for:DeprecationWarning ignore::DeprecationWarning:glue ignore::DeprecationWarning:bqplot ignore::DeprecationWarning:bqplot_image_gl From a9427bf01763c80d090e05b4f9e58dd8b135daa6 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Tue, 29 Nov 2022 13:17:50 -0500 Subject: [PATCH 09/13] Use built-in float --- jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py index 8871aafc12..f3aa085cf2 100644 --- a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py +++ b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py @@ -17,8 +17,8 @@ def jwst_header_to_skyregion(header): s_region = header['S_REGION'] footprint = s_region.split("POLYGON ICRS")[1].split() - ra = np.array(footprint[::2], dtype=np.float_) - dec = np.array(footprint[1::2], dtype=np.float_) + ra = np.array(footprint[::2], dtype=float) + dec = np.array(footprint[1::2], dtype=float) # Find center of slit cra = (max(ra) + min(ra)) / 2 From ac7330cf42a443dee572a2ab2c736793bfbb8db6 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Tue, 29 Nov 2022 13:41:57 -0500 Subject: [PATCH 10/13] Make slice test more deterministic --- jdaviz/configs/cubeviz/plugins/slice/tests/test_slice.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jdaviz/configs/cubeviz/plugins/slice/tests/test_slice.py b/jdaviz/configs/cubeviz/plugins/slice/tests/test_slice.py index f58d10182b..f5fc537416 100644 --- a/jdaviz/configs/cubeviz/plugins/slice/tests/test_slice.py +++ b/jdaviz/configs/cubeviz/plugins/slice/tests/test_slice.py @@ -72,6 +72,9 @@ def test_slice(cubeviz_helper, spectrum1d_cube): # Test player buttons API + sl.vue_goto_first() + assert sl.slice == 0 + sl.vue_goto_last() assert sl.slice == sl.max_value @@ -89,9 +92,6 @@ def test_slice(cubeviz_helper, spectrum1d_cube): assert not sl._player # NOTE: Hard to check sl.slice here because it is non-deterministic. - sl.vue_goto_first() - assert sl.slice == 0 - def test_indicator_settings(cubeviz_helper, spectrum1d_cube): app = cubeviz_helper.app From 0b173c9dc9fd403ccd4c1ebf35927ed273661276 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Tue, 29 Nov 2022 14:49:51 -0500 Subject: [PATCH 11/13] See if I broke it --- jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py index f3aa085cf2..892011c2cd 100644 --- a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py +++ b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py @@ -17,8 +17,8 @@ def jwst_header_to_skyregion(header): s_region = header['S_REGION'] footprint = s_region.split("POLYGON ICRS")[1].split() - ra = np.array(footprint[::2], dtype=float) - dec = np.array(footprint[1::2], dtype=float) + ra = np.array(footprint[::2], dtype=np.float) + dec = np.array(footprint[1::2], dtype=np.float) # Find center of slit cra = (max(ra) + min(ra)) / 2 From f6d0f8bda67bc2035089d936d39a695643982bec Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Tue, 29 Nov 2022 14:50:56 -0500 Subject: [PATCH 12/13] Oooops --- jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py index 892011c2cd..8871aafc12 100644 --- a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py +++ b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py @@ -17,8 +17,8 @@ def jwst_header_to_skyregion(header): s_region = header['S_REGION'] footprint = s_region.split("POLYGON ICRS")[1].split() - ra = np.array(footprint[::2], dtype=np.float) - dec = np.array(footprint[1::2], dtype=np.float) + ra = np.array(footprint[::2], dtype=np.float_) + dec = np.array(footprint[1::2], dtype=np.float_) # Find center of slit cra = (max(ra) + min(ra)) / 2 From c12b10ab4402b6e555f467e8310c27be5e71722a Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Tue, 29 Nov 2022 15:36:26 -0500 Subject: [PATCH 13/13] Back to built-in float --- jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py index 8871aafc12..f3aa085cf2 100644 --- a/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py +++ b/jdaviz/configs/mosviz/plugins/slit_overlay/slit_overlay.py @@ -17,8 +17,8 @@ def jwst_header_to_skyregion(header): s_region = header['S_REGION'] footprint = s_region.split("POLYGON ICRS")[1].split() - ra = np.array(footprint[::2], dtype=np.float_) - dec = np.array(footprint[1::2], dtype=np.float_) + ra = np.array(footprint[::2], dtype=float) + dec = np.array(footprint[1::2], dtype=float) # Find center of slit cra = (max(ra) + min(ra)) / 2