Merge branch 'main' into awkward-v2-only

.github/workflows/ci.yml

@@ -28,7 +28,6 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
-      - uses: pre-commit/action@v3.0.1
       - name: PyLint
         run: |
           echo "::add-matcher::$GITHUB_WORKSPACE/.github/matchers/pylint.json"

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.5.0"
+    rev: "v0.5.1"
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]

noxfile.py

@@ -37,7 +37,12 @@ def lite(session: nox.Session) -> None:
 def tests(session: nox.Session) -> None:
     """Run the unit and regular tests."""
     session.install("-e", ".[awkward,numba,test,test-extras,sympy]")
-    session.run("pytest", "--ignore", "tests/test_notebooks.py", *session.posargs)
+    session.run(
+        "pytest",
+        "--ignore",
+        "tests/test_notebooks.py",
+        *session.posargs,
+    )
 
 
 @nox.session(reuse_venv=True, python=ALL_PYTHON)

tests/compute/sympy/lorentz/test_Et.py

@@ -96,22 +96,18 @@ def test_xy_eta_tau():
             sympy.sqrt(sympy.Abs(-(t**2) + x**2 + y**2 + z**2))
         ),
     )
-    # TODO: why won't sympy equate the expressions without double
-    # simplifying?
     assert (
         sympy.simplify(
             vec.Et.simplify()
-            - sympy.sqrt(
-                (
-                    0.25
-                    * (x**2 + y**2)
-                    * (sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2))) + 1) ** 2
-                    + sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2)))
-                    * sympy.Abs(-(t**2) + x**2 + y**2 + z**2)
-                )
-                * sympy.exp(-2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2)))
+            - 2
+            * sympy.sqrt(
+                0.25
+                * (x**2 + y**2)
+                * (sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2))) + 1) ** 2
+                + sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2)))
+                * sympy.Abs(-(t**2) + x**2 + y**2 + z**2)
             )
-            / sympy.sqrt(z**2 / (x**2 + y**2) + 1)
+            / (sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2))) + 1)
         )
         == 0
     )
@@ -188,10 +184,8 @@ def test_rhophi_eta_tau():
             sympy.sqrt(sympy.Abs(rho**2 - t**2 + z**2))
         ),
     )
-    assert vec.Et.simplify() == sympy.sqrt(
-        0.25 * rho**2 * sympy.exp(2 * sympy.asinh(z / rho))
-        + 0.5 * rho**2
-        + 0.25 * rho**2 * sympy.exp(-2 * sympy.asinh(z / rho))
-        + sympy.Abs(rho**2 - t**2 + z**2)
-    ) / sympy.sqrt(1 + z**2 / rho**2)
+    assert vec.Et.simplify() == 2 * sympy.sqrt(
+        0.25 * rho**2 * (sympy.exp(2 * sympy.asinh(z / rho)) + 1) ** 2
+        + sympy.exp(2 * sympy.asinh(z / rho)) * sympy.Abs(rho**2 - t**2 + z**2)
+    ) / (sympy.exp(2 * sympy.asinh(z / rho)) + 1)
     assert vec.Et.subs(values).evalf() == pytest.approx(math.sqrt(80))

tests/compute/sympy/lorentz/test_Et2.py

@@ -91,7 +91,7 @@ def test_xy_eta_tau():
             sympy.sqrt(sympy.Abs(-(t**2) + x**2 + y**2 + z**2))
         ),
     )
-    assert vec.Et2.simplify() == x**2 + y**2 + sympy.Abs(
+    assert vec.Et2.simplify() == 1.0 * x**2 + 1.0 * y**2 + sympy.Abs(
         -(t**2) + x**2 + y**2 + z**2
     ) / (z**2 / (x**2 + y**2) + 1)
     assert vec.Et2.subs(values).evalf() == pytest.approx(80)
@@ -167,7 +167,7 @@ def test_rhophi_eta_tau():
             sympy.sqrt(sympy.Abs(rho**2 - t**2 + z**2))
         ),
     )
-    assert vec.Et2.simplify() == rho**2 + sympy.Abs(rho**2 - t**2 + z**2) / (
+    assert vec.Et2.simplify() == 1.0 * rho**2 + sympy.Abs(rho**2 - t**2 + z**2) / (
         1 + z**2 / rho**2
     )
     assert vec.Et2.subs(values).evalf() == pytest.approx(80)

tests/compute/sympy/lorentz/test_beta.py

@@ -97,23 +97,18 @@ def test_xy_eta_tau():
             sympy.sqrt(sympy.Abs(-(t**2) + x**2 + y**2 + z**2))
         ),
     )
-    # TODO: why won't sympy equate the expressions without double
-    # simplifying?
     assert (
         sympy.simplify(
             vec.beta.simplify()
-            - 1.0
+            - 0.5
             * sympy.sqrt(x**2 + y**2)
-            * sympy.sqrt(z**2 / (x**2 + y**2) + 1)
+            * (sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2))) + 1)
             / sympy.sqrt(
-                (
-                    0.25
-                    * (x**2 + y**2)
-                    * (sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2))) + 1) ** 2
-                    + sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2)))
-                    * sympy.Abs(-(t**2) + x**2 + y**2 + z**2)
-                )
-                * sympy.exp(-2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2)))
+                0.25
+                * (x**2 + y**2)
+                * (sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2))) + 1) ** 2
+                + sympy.exp(2 * sympy.asinh(z / sympy.sqrt(x**2 + y**2)))
+                * sympy.Abs(-(t**2) + x**2 + y**2 + z**2)
             )
         )
         == 0
@@ -191,13 +186,10 @@ def test_rhophi_eta_tau():
             sympy.sqrt(sympy.Abs(rho**2 - t**2 + z**2))
         ),
     )
-    assert vec.beta.simplify() == 1.0 * rho * sympy.sqrt(
-        1 + z**2 / rho**2
+    assert vec.beta.simplify() == 0.5 * rho * (
+        sympy.exp(2 * sympy.asinh(z / rho)) + 1
     ) / sympy.sqrt(
-        (
-            0.25 * rho**2 * (sympy.exp(2 * sympy.asinh(z / rho)) + 1) ** 2
-            + sympy.exp(2 * sympy.asinh(z / rho)) * sympy.Abs(rho**2 - t**2 + z**2)
-        )
-        * sympy.exp(-2 * sympy.asinh(z / rho))
+        0.25 * rho**2 * (sympy.exp(2 * sympy.asinh(z / rho)) + 1) ** 2
+        + sympy.exp(2 * sympy.asinh(z / rho)) * sympy.Abs(rho**2 - t**2 + z**2)
     )
     assert vec.beta.subs(values).evalf() == pytest.approx(0.5590169943749475)

tests/compute/sympy/test_unit.py

@@ -29,7 +29,9 @@ def test_planar_sympy():
         u = t.unit()
         assert type(u) is type(t)
         assert type(u.azimuthal) is type(t.azimuthal)
-        assert u.rho == 1 if isinstance(u.rho, int) else u.rho.subs(values).evalf() == 1
+        assert (
+            u.rho == 1 if isinstance(u.rho, int) else u.rho.subs(values).evalf() == 1.0
+        )
 
 
 def test_spatial_sympy():
@@ -49,7 +51,7 @@ def test_spatial_sympy():
         assert type(u) is type(t)
         assert type(u.azimuthal) is type(t.azimuthal)
         assert type(u.longitudinal) is type(t.longitudinal)
-        assert u.mag.subs(values).evalf() == 1
+        assert u.mag.subs(values).evalf() == 1.0
 
 
 def test_lorentz_sympy():
@@ -90,4 +92,6 @@ def test_lorentz_sympy():
         assert type(u.azimuthal) is type(t.azimuthal)
         assert type(u.longitudinal) is type(t.longitudinal)
         assert type(u.temporal) is type(t.temporal)
-        assert u.tau == 1 if isinstance(u.tau, int) else u.tau.subs(values).evalf() == 1
+        assert (
+            u.tau == 1 if isinstance(u.tau, int) else u.tau.subs(values).evalf() == 1.0
+        )