Awkward v2 (#57)

* increase clouddrift version

* set min awkward to v2

* remove ._v2 and change packed() -> to_packed()

Author: philippemiron

clouddrift/dataformat.py

@@ -1,4 +1,4 @@
-import awkward._v2 as ak
+import awkward as ak
 import xarray as xr
 import numpy as np
 from collections.abc import Callable

clouddrift/select.py

@@ -1,4 +1,4 @@
-import awkward._v2 as ak
+import awkward as ak
 import numpy as np
 
 
@@ -69,9 +69,9 @@ def subset(ds: ak.Array, criteria: dict) -> ak.Array:
         print("Empty set.")
         return ak.Array([])
     else:  # apply the filtering for both dimensions
-        ds_subset = ak.packed(ds[mask_traj])
+        ds_subset = ak.to_packed(ds[mask_traj])
         ds_subset = ak.with_field(
-            ds_subset, ak.packed(ds.obs[mask_obs][mask_traj]), "obs"
+            ds_subset, ak.to_packed(ds.obs[mask_obs][mask_traj]), "obs"
         )
         ds_subset = ak.with_field(
             ds_subset, ak.Array([len(x) for x in ds_subset.obs.ids]), "rowsize"

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "clouddrift"
-version = "0.3.0"
+version = "0.3.1"
 authors = [
   { name="Shane Elipot", email="[email protected]" },
   { name="Philippe Miron", email="[email protected]" },
@@ -26,7 +26,7 @@ dependencies = [
     "pyarrow>=8.0.0",
     "tqdm>=4.64.0",
     "fsspec>=2022.3.0",
-    "awkward>=1.9.0",
+    "awkward>=2.0.0",
 ]
 
 [project.urls]

tests/dataformat_tests.py

@@ -4,7 +4,7 @@
 import xarray as xr
 import numpy as np
 from clouddrift import RaggedArray
-import awkward._v2 as ak
+import awkward as ak
 
 NETCDF_ARCHIVE = "test_archive.nc"
 PARQUET_ARCHIVE = "test_archive.parquet"

tests/environment.yml

@@ -12,5 +12,5 @@ dependencies:
   - llvmlite>=0.38.1
   - pip>=22.2.2
   - pip:
-    - awkward
+    - awkward>=2.0.0
     - git+https://github.com/Cloud-Drift/clouddrift.git

tests/select_tests.py

@@ -2,7 +2,7 @@
 from unittest import TestCase
 import numpy as np
 import xarray as xr
-import awkward._v2 as ak
+import awkward as ak
 from clouddrift import RaggedArray, select
 
 if __name__ == "__main__":