From 99b46aec5089aa9f3e5f09f62893be775f626cd4 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 2 Jan 2026 00:52:42 +0100 Subject: [PATCH 1/7] remove numpy version pins in setup.py Removed conditional numpy versioning based on Python version. --- setup.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/setup.py b/setup.py index f57562c73..89f58daab 100644 --- a/setup.py +++ b/setup.py @@ -10,20 +10,7 @@ "ThrustRTC>=0.3.20", "CURandRTC>=0.1.2", "numba>=0.51.2", - # TODO #1344: (numpy 2.0.0 incompatibility in https://github.com/bjodah/chempy/issues/234) "numpy" - + ( - { - 8: "==1.24.4", - 9: "==1.24.4", - 10: "==1.24.4", - 11: "==1.24.4", - 12: "==1.26.4", - 13: "==1.26.4", - }[sys.version_info.minor] - if CI - else "" - ), "Pint", "chempy", "scipy" From 108994120c8bba43b2c6757c7777601942e38125 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 2 Jan 2026 01:05:31 +0100 Subject: [PATCH 2/7] syntax fix --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 89f58daab..9047bc6ed 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ "ThrustRTC>=0.3.20", "CURandRTC>=0.1.2", "numba>=0.51.2", - "numpy" + "numpy", "Pint", "chempy", "scipy" From 981fb553cde4f28d75d89914ab706df40c384409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agnieszka=20=C5=BBaba?= Date: Mon, 26 Jan 2026 14:29:45 +0100 Subject: [PATCH 3/7] update Pint verion on CI --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9047bc6ed..f274cc159 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ "PyPartMC==1.7.2", "numba==0.60.0", "CURandRTC==0.1.7", - "Pint==0.21.1", + "Pint==0.25.2", "chempy==0.8.3", "pyevtk==1.6.0", ], From bf847d8c2b055a0b4da99e2b1aea67c4d258cf6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agnieszka=20=C5=BBaba?= Date: Tue, 27 Jan 2026 17:15:56 +0100 Subject: [PATCH 4/7] setup numpy version on CI --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index f274cc159..b59fe52c3 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ "Pint==0.25.2", "chempy==0.8.3", "pyevtk==1.6.0", + "numpy==1.25.3", ], } From 3111563e505f3bcbea6becb925de8700f5bb39f7 Mon Sep 17 00:00:00 2001 From: AgnieszkaZaba <56157996+AgnieszkaZaba@users.noreply.github.com> Date: Wed, 28 Jan 2026 02:05:18 +0100 Subject: [PATCH 5/7] change pint pinned version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b59fe52c3..c6ef421a8 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ "PyPartMC==1.7.2", "numba==0.60.0", "CURandRTC==0.1.7", - "Pint==0.25.2", + "Pint==0.24.4", "chempy==0.8.3", "pyevtk==1.6.0", "numpy==1.25.3", From 0720a11a829b7feb73d468be02358b8faecda85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agnieszka=20=C5=BBaba?= Date: Wed, 28 Jan 2026 10:38:41 +0100 Subject: [PATCH 6/7] remove numpy specific pin --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index c6ef421a8..4f777957e 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,6 @@ "Pint==0.24.4", "chempy==0.8.3", "pyevtk==1.6.0", - "numpy==1.25.3", ], } From f3c1a03f6dd8aaf77edbbbf0788c5f0ef3578d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agnieszka=20=C5=BBaba?= Date: Wed, 28 Jan 2026 10:53:16 +0100 Subject: [PATCH 7/7] change np.NaN to np.nan --- .../dynamics/collisions/test_sdm_breakup.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/unit_tests/dynamics/collisions/test_sdm_breakup.py b/tests/unit_tests/dynamics/collisions/test_sdm_breakup.py index 9f5a8ccad..19c47750c 100644 --- a/tests/unit_tests/dynamics/collisions/test_sdm_breakup.py +++ b/tests/unit_tests/dynamics/collisions/test_sdm_breakup.py @@ -98,7 +98,7 @@ def test_single_collision_bounce(params, backend_instance): # Arrange backend = backend_instance n_sd = 2 - env = Box(dv=np.NaN, dt=np.NaN) + env = Box(dv=np.nan, dt=np.nan) builder = Builder(n_sd, backend, environment=env) n_init = [6, 6] particulator = builder.build( @@ -178,7 +178,7 @@ def test_breakup_counters( # Arrange n_init = params["n_init"] n_sd = len(n_init) - env = Box(dv=np.NaN, dt=np.NaN) + env = Box(dv=np.nan, dt=np.nan) builder = Builder(n_sd, backend_instance, environment=env) particulator = builder.build( attributes={ @@ -347,7 +347,7 @@ def test_attribute_update_single_breakup( # Arrange n_init = params["n_init"] n_sd = len(n_init) - env = Box(dv=np.NaN, dt=np.NaN) + env = Box(dv=np.nan, dt=np.nan) builder = Builder(n_sd, backend_class(double_precision=True), environment=env) particulator = builder.build( attributes={ @@ -467,7 +467,7 @@ def test_attribute_update_n_breakups( def run_simulation(_n_times, _gamma): n_init = params["n_init"] n_sd = len(n_init) - env = Box(dv=np.NaN, dt=np.NaN) + env = Box(dv=np.nan, dt=np.nan) builder = Builder(n_sd, backend_class(), environment=env) particulator = builder.build( attributes={ @@ -546,7 +546,7 @@ def test_multiplicity_overflow(backend=CPU()): # pylint: disable=too-many-local } n_init = params["n_init"] n_sd = len(n_init) - env = Box(dv=np.NaN, dt=np.NaN) + env = Box(dv=np.nan, dt=np.nan) builder = Builder(n_sd, backend, environment=env) particulator = builder.build( attributes={ @@ -615,7 +615,7 @@ def test_same_multiplicity_overflow_no_substeps( } n_init = params["n_init"] n_sd = len(n_init) - env = Box(dv=np.NaN, dt=np.NaN) + env = Box(dv=np.nan, dt=np.nan) builder = Builder(n_sd, backend, environment=env) particulator = builder.build( attributes={ @@ -713,7 +713,7 @@ def test_noninteger_fragments( # Arrange n_init = params["n_init"] n_sd = len(n_init) - env = Box(dv=np.NaN, dt=np.NaN) + env = Box(dv=np.nan, dt=np.nan) builder = Builder(n_sd, backend_instance, environment=env) particulator = builder.build( attributes={ @@ -866,7 +866,7 @@ def test_while_loop_multi_breakup( # Arrange n_init = params["n_init"] n_sd = len(n_init) - env = Box(dv=np.NaN, dt=np.NaN) + env = Box(dv=np.nan, dt=np.nan) builder = Builder( n_sd, backend_class(Formulae(handle_all_breakups=True)), environment=env )