Merge branch 'v4-dev' into implementing_field_interpolation_api

Author: erikvansebille

.github/workflows/ci.yml

@@ -33,6 +33,8 @@ jobs:
         include:
           - os: ubuntu
             pixi-environment: "test-py311"
+          - os: ubuntu
+            pixi-environment: "test-py313"
           - os: ubuntu
             pixi-environment: "test-minimum"
     steps:

pixi.toml

@@ -21,14 +21,14 @@ platforms = ["win-64", "linux-64", "osx-64", "osx-arm64"]
 test-latest = { features = ["test"], solve-group = "test" }
 test-minimum = { features = ["test", "minimum"], solve-group = "test" }
 test-py311 = { features = ["test", "py311"] }
-test-py312 = { features = ["test", "py312"] }
+test-py313 = { features = ["test", "py313"] }
 test-notebooks = { features = ["test", "notebooks"], solve-group = "test" }
 docs = { features = ["docs"], solve-group = "docs" }
 typing = { features = ["typing"], solve-group = "typing" }
 pre-commit = { features = ["pre-commit"], no-default-feature = true }
 
 [dependencies] # keep section in sync with pyproject.toml dependencies
-python = ">=3.11,<3.13"
+python = ">=3.11"
 # parcels = { path = "." }
 netcdf4 = ">=1.7.2"
 numpy = ">=2.1.0"
@@ -62,8 +62,8 @@ pooch = "==1.8.0"
 [feature.py311.dependencies]
 python = "3.11.*"
 
-[feature.py312.dependencies]
-python = "3.12.*"
+[feature.py313.dependencies]
+python = "3.13.*"
 
 [feature.test.dependencies]
 nbval = "*"

pyproject.toml

@@ -8,7 +8,7 @@ description = "Framework for Lagrangian tracking of virtual ocean particles in t
 readme = "README.md"
 dynamic = ["version"]
 authors = [{ name = "Parcels team" }]
-requires-python = ">=3.11,<3.13"
+requires-python = ">=3.11"
 license = { file = "LICENSE.md" }
 classifiers = [
   "License :: OSI Approved :: MIT License",

tests/test_particleset_execute.py

@@ -24,7 +24,6 @@
 from parcels._datasets.unstructured.generic import datasets as datasets_unstructured
 from parcels.interpolators import UXPiecewiseConstantFace, UXPiecewiseLinearNode
 from parcels.kernels import AdvectionEE, AdvectionRK4, AdvectionRK4_3D
-from tests import utils
 from tests.common_kernels import DoNothing
 
 
@@ -475,8 +474,8 @@ def test_uxstommelgyre_pset_execute():
         runtime=np.timedelta64(10, "m"),
         dt=np.timedelta64(60, "s"),
     )
-    assert utils.round_and_hash_float_array([p.lon for p in pset]) == 1165396086
-    assert utils.round_and_hash_float_array([p.lat for p in pset]) == 1142124776
+    np.testing.assert_allclose(pset[0].lon, 29.997648, atol=1e-3)
+    np.testing.assert_allclose(pset[0].lat, 4.998691, atol=1e-3)
 
 
 def test_uxstommelgyre_multiparticle_pset_execute():