From 530dc5da2f69890d722dfa8074d22f078432802f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Terrier?= Date: Wed, 19 Jun 2024 11:14:32 +0200 Subject: [PATCH 1/7] Temporary fix for CI with numpy 2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Régis Terrier --- environment-dev.yml | 2 +- setup.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/environment-dev.yml b/environment-dev.yml index be53f3a62e..bbcdcfd038 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -27,7 +27,6 @@ dependencies: - regions>=0.5 - matplotlib>=3.4 - scipy!=1.10 - - iminuit>=2.8.0 - extension-helpers # test dependencies - codecov @@ -77,6 +76,7 @@ dependencies: - pyinstrument - memray - pip: + - iminuit>=2.26 - sherpa - pytest-sphinx - ray[default]>=2.9 diff --git a/setup.cfg b/setup.cfg index d62429fe1f..456be6d667 100644 --- a/setup.cfg +++ b/setup.cfg @@ -79,6 +79,7 @@ test = sphinx docs = astropy>=5.0,<5.3 + numpy<2.0 sphinx-astropy sphinx sphinx-click From d83951d570dbcd21b70b9a7950826f5723be509f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Terrier?= Date: Wed, 19 Jun 2024 11:58:09 +0200 Subject: [PATCH 2/7] Correct hess test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Régis Terrier --- gammapy/catalog/tests/test_hess.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gammapy/catalog/tests/test_hess.py b/gammapy/catalog/tests/test_hess.py index b1bd70d400..629c9a88eb 100644 --- a/gammapy/catalog/tests/test_hess.py +++ b/gammapy/catalog/tests/test_hess.py @@ -263,7 +263,7 @@ def test_sky_model_shell(cat): assert_allclose(p["lon_0"].value, 266.287384) assert_allclose(p["lat_0"].value, -1.243260383605957) assert_allclose(p["radius"].value, 0.95) - assert_allclose(p["width"].value, 0.05) + assert_allclose(p["width"].value, 0.05, atol=2e-8) @staticmethod def test_flux_points_meta(cat): From 2696672fa288df1c1a30e61d4518d48f3810dfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Terrier?= Date: Wed, 19 Jun 2024 12:04:25 +0200 Subject: [PATCH 3/7] Revert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Régis Terrier --- gammapy/catalog/tests/test_hess.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gammapy/catalog/tests/test_hess.py b/gammapy/catalog/tests/test_hess.py index 629c9a88eb..b1bd70d400 100644 --- a/gammapy/catalog/tests/test_hess.py +++ b/gammapy/catalog/tests/test_hess.py @@ -263,7 +263,7 @@ def test_sky_model_shell(cat): assert_allclose(p["lon_0"].value, 266.287384) assert_allclose(p["lat_0"].value, -1.243260383605957) assert_allclose(p["radius"].value, 0.95) - assert_allclose(p["width"].value, 0.05, atol=2e-8) + assert_allclose(p["width"].value, 0.05) @staticmethod def test_flux_points_meta(cat): From 5b21a21fc9fb7e8963527589c2f951c19eb0c95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Terrier?= Date: Wed, 19 Jun 2024 15:33:06 +0200 Subject: [PATCH 4/7] Impose iminuit>2.26 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Régis Terrier --- environment-dev.yml | 4 ++-- setup.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment-dev.yml b/environment-dev.yml index bbcdcfd038..c2916733fe 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -5,7 +5,7 @@ # Activate: conda activate gammapy-dev # Deactivate: conda deactivate -name: gammapy-dev +name: gammapy-dev-test channels: - conda-forge @@ -27,6 +27,7 @@ dependencies: - regions>=0.5 - matplotlib>=3.4 - scipy!=1.10 + - iminuit>=2.26 - extension-helpers # test dependencies - codecov @@ -76,7 +77,6 @@ dependencies: - pyinstrument - memray - pip: - - iminuit>=2.26 - sherpa - pytest-sphinx - ray[default]>=2.9 diff --git a/setup.cfg b/setup.cfg index 456be6d667..7765370489 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,7 +41,7 @@ install_requires = pyyaml>=5.3 click>=7.0 pydantic>=2.5.0 - iminuit>=2.8.0 + iminuit>=2.26 matplotlib>=3.4 [options.entry_points] From f464a707f9ebec5f9b4f50eadffbc4d47d4b4851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Terrier?= Date: Wed, 19 Jun 2024 15:38:55 +0200 Subject: [PATCH 5/7] change env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Régis Terrier --- environment-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-dev.yml b/environment-dev.yml index c2916733fe..21895409e0 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -27,7 +27,7 @@ dependencies: - regions>=0.5 - matplotlib>=3.4 - scipy!=1.10 - - iminuit>=2.26 + - iminuit>=2.8.0 - extension-helpers # test dependencies - codecov From 69583c0f912ae2153764bd803cd3f2655f0b3090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Terrier?= Date: Wed, 19 Jun 2024 15:40:16 +0200 Subject: [PATCH 6/7] change env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Régis Terrier --- environment-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment-dev.yml b/environment-dev.yml index 21895409e0..bbcdcfd038 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -5,7 +5,7 @@ # Activate: conda activate gammapy-dev # Deactivate: conda deactivate -name: gammapy-dev-test +name: gammapy-dev channels: - conda-forge @@ -27,7 +27,6 @@ dependencies: - regions>=0.5 - matplotlib>=3.4 - scipy!=1.10 - - iminuit>=2.8.0 - extension-helpers # test dependencies - codecov @@ -77,6 +76,7 @@ dependencies: - pyinstrument - memray - pip: + - iminuit>=2.26 - sherpa - pytest-sphinx - ray[default]>=2.9 From f14245aa278a9b8973399c198507410752d7eac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Terrier?= Date: Thu, 20 Jun 2024 17:20:34 +0200 Subject: [PATCH 7/7] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 7765370489..456be6d667 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,7 +41,7 @@ install_requires = pyyaml>=5.3 click>=7.0 pydantic>=2.5.0 - iminuit>=2.26 + iminuit>=2.8.0 matplotlib>=3.4 [options.entry_points]