fix: make tests passing again (#269)

* Get rid of ak.zip

* double constituents for softdrop multi test

* gcc is not needed in macos - we use clang

* upgrade boost to 1.84

* update cgal to 5.6

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Install compiler tools on macOS
         if: runner.os == 'macOS'
         run: |
-          brew install make gcc automake swig gmp mpfr boost
+          brew install make automake swig gmp mpfr boost
           export PATH="/usr/local/opt/make/libexec/gnubin:$PATH"
 
       - name: Install extra deps on Linux
@@ -81,12 +81,12 @@ jobs:
       - uses: docker/setup-qemu-action@v3
         if: matrix.arch != 'auto64'
         with:
-         platforms: all
+          platforms: all
 
       - name: Install compiler tools on macOS
         if: runner.os == 'macOS'
         run: |
-          brew install make gcc automake swig gmp mpfr boost
+          brew install make automake swig gmp mpfr boost
           export PATH="/usr/local/opt/make/libexec/gnubin:$PATH"
 
       - uses: pypa/cibuildwheel@v2.16

.github/workflows/wheels.yml

@@ -49,7 +49,7 @@ jobs:
       - uses: docker/setup-qemu-action@v3
         if: matrix.arch != 'auto64'
         with:
-         platforms: arm64
+          platforms: arm64
 
       - uses: actions/checkout@v4
         with:
@@ -58,7 +58,7 @@ jobs:
       - name: Install compiler tools on macOS
         if: runner.os == 'macOS'
         run: |
-          brew install make gcc automake swig gmp mpfr boost
+          brew install make automake swig gmp mpfr boost
           export PATH="/usr/local/opt/make/libexec/gnubin:$PATH"
 
       - uses: pypa/cibuildwheel@v2.16

pyproject.toml

@@ -17,9 +17,9 @@ manylinux-i686-image = "manylinux2014"
 before-all = [
     "yum update -y",
     "yum install -y mpfr-devel",
-    "curl -L https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2 -o boost_1_80_0.tar.bz2",
-    "tar --bzip2 -xf boost_1_80_0.tar.bz2",
-    "mv boost_1_80_0/boost /usr/include/boost",
+    "curl -L https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.bz2 -o boost_1_84_0.tar.bz2",
+    "tar --bzip2 -xf boost_1_84_0.tar.bz2",
+    "mv boost_1_84_0/boost /usr/include/boost",
 ]
 # Skip musllinux builds for the moment
 skip = "*-musllinux_*"

setup.py

@@ -21,9 +21,7 @@
 import setuptools.command.build_ext
 import setuptools.command.install
 
-CGAL_ZIP = (
-    "https://github.com/CGAL/cgal/releases/download/v5.5.1/CGAL-5.5.1-library.zip"
-)
+CGAL_ZIP = "https://github.com/CGAL/cgal/releases/download/v5.6/CGAL-5.6-library.zip"
 
 DIR = pathlib.Path(__file__).parent.resolve()
 FASTJET = DIR / "fastjet-core"

tests/test_002-exclusive_jets.py

@@ -227,16 +227,12 @@ def test_exclusive_jets_softdrop_grooming():
     cluster = fastjet._pyjet.AwkwardClusterSequence(array, jetdef)
     softdrop = cluster.exclusive_jets_softdrop_grooming()
 
-    softdrop_output = ak.zip(
+    softdrop_output = ak.from_iter(
         {
-            "constituents": ak.Record(
-                {
-                    "px": [32.2, 32.45],
-                    "py": [64.21, 63.21],
-                    "pz": [543.34, 543.14],
-                    "E": [600.12, 599.56],
-                }
-            ),
+            "constituents": [
+                {"px": 32.2, "py": 64.21, "pz": 543.34, "E": 600.12},
+                {"px": 32.45, "py": 63.21, "pz": 543.14, "E": 599.56},
+            ],
             "msoftdrop": 488.2395243115817,
             "ptsoftdrop": 142.88274528437645,
             "etasoftdrop": 2.726117171791057,
@@ -341,15 +337,19 @@ def test_exclusive_jets_softdrop_grooming_multi():
     cluster = fastjet._pyjet.AwkwardClusterSequence(array, jetdef)
     softdrop = cluster.exclusive_jets_softdrop_grooming()
 
-    softdrop_output = ak.zip(
+    softdrop_output = ak.from_iter(
         {
-            "constituents": ak.Record(
-                {
-                    "px": [32.2, 32.45],
-                    "py": [64.21, 63.21],
-                    "pz": [543.34, 543.14],
-                    "E": [600.12, 599.56],
-                }
+            "constituents": ak.Array(
+                [
+                    [
+                        {"px": 32.2, "py": 64.21, "pz": 543.34, "E": 600.12},
+                        {"px": 32.45, "py": 63.21, "pz": 543.14, "E": 599.56},
+                    ],
+                    [
+                        {"px": 32.2, "py": 64.21, "pz": 543.34, "E": 600.12},
+                        {"px": 32.45, "py": 63.21, "pz": 543.14, "E": 599.56},
+                    ],
+                ],
             ),
             "msoftdrop": ak.Array([488.2395243115817, 488.2395243115817]),
             "ptsoftdrop": ak.Array([142.88274528437645, 142.88274528437645]),

tests/test_008-dask.py

@@ -172,16 +172,12 @@ def dask_multi_test_exclusive_jets_softdrop_grooming():
         cluster = fastjet._pyjet.DaskAwkwardClusterSequence(darray, jetdef)
         softdrop = cluster.exclusive_jets_softdrop_grooming().compute()
 
-        softdrop_output = ak.zip(
+        softdrop_output = ak.from_iter(
             {
-                "constituents": ak.Record(
-                    {
-                        "px": [32.2, 32.45],
-                        "py": [64.21, 63.21],
-                        "pz": [543.34, 543.14],
-                        "E": [600.12, 599.56],
-                    }
-                ),
+                "constituents": [
+                    {"px": 32.2, "py": 64.21, "pz": 543.34, "E": 600.12},
+                    {"px": 32.45, "py": 63.21, "pz": 543.14, "E": 599.56},
+                ],
                 "msoftdrop": ak.Array([488.2395243115817, 488.2395243115817]),
                 "ptsoftdrop": ak.Array([142.88274528437645, 142.88274528437645]),
                 "etasoftdrop": ak.Array([2.726117171791057, 2.726117171791057]),