diff --git a/setup.py b/setup.py index f57562c73..4f777957e 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 "" - ), + "numpy", "Pint", "chempy", "scipy" @@ -50,7 +37,7 @@ "PyPartMC==1.7.2", "numba==0.60.0", "CURandRTC==0.1.7", - "Pint==0.21.1", + "Pint==0.24.4", "chempy==0.8.3", "pyevtk==1.6.0", ], 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 )