Merge pull request #11 from zfit/dependabot/github_actions/actions-41…

…85700fd3

Bump the actions group with 2 updates

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
         run: |
           echo "::add-matcher::$GITHUB_WORKSPACE/.github/matchers/pylint.json"
           pipx run nox -s pylint
-      - uses: scientific-python/repo-review@v0.10.6
+      - uses: scientific-python/repo-review@v0.11.0
         with:
           plugins: sp-repo-review
 
@@ -60,7 +60,9 @@ jobs:
         run: python -m pip install .[test]
 
       - name: Test package
-        run: python -m pytest -ra --cov --cov-report=xml --cov-report=term --durations=20
+        run:
+          python -m pytest -ra --cov --cov-report=xml --cov-report=term
+          --durations=20
 
       - name: Upload coverage report
-        uses: codecov/[email protected].0
+        uses: codecov/[email protected].1

noxfile.py

@@ -13,9 +13,7 @@
 
 @nox.session
 def lint(session: nox.Session) -> None:
-    """
-    Run the linter.
-    """
+    """Run the linter."""
     session.install("pre-commit")
     session.run(
         "pre-commit", "run", "--all-files", "--show-diff-on-failure", *session.posargs
@@ -24,9 +22,7 @@ def lint(session: nox.Session) -> None:
 
 @nox.session
 def pylint(session: nox.Session) -> None:
-    """
-    Run PyLint.
-    """
+    """Run PyLint."""
     # This needs to be installed into the package environment, and is slower
     # than a pre-commit check
     session.install(".", "pylint")
@@ -35,17 +31,16 @@ def pylint(session: nox.Session) -> None:
 
 @nox.session
 def tests(session: nox.Session) -> None:
-    """
-    Run the unit and regular tests.
-    """
+    """Run the unit and regular tests."""
     session.install(".[test]")
     session.run("pytest", *session.posargs)
 
 
 @nox.session(reuse_venv=True)
 def docs(session: nox.Session) -> None:
-    """
-    Build the docs. Pass "--serve" to serve. Pass "-b linkcheck" to check links.
+    """Build the docs.
+
+    Pass "--serve" to serve. Pass "-b linkcheck" to check links.
     """
 
     parser = argparse.ArgumentParser()
@@ -86,9 +81,7 @@ def docs(session: nox.Session) -> None:
 
 @nox.session
 def build_api_docs(session: nox.Session) -> None:
-    """
-    Build (regenerate) API docs.
-    """
+    """Build (regenerate) API docs."""
 
     session.install("sphinx")
     session.chdir("docs")
@@ -105,9 +98,7 @@ def build_api_docs(session: nox.Session) -> None:
 
 @nox.session
 def build(session: nox.Session) -> None:
-    """
-    Build an SDist and wheel.
-    """
+    """Build an SDist and wheel."""
 
     build_path = DIR.joinpath("build")
     if build_path.exists():

src/zfit_pwa/__init__.py

@@ -1,5 +1,4 @@
-"""
-Copyright (c) 2024 Jonas Eschle. All rights reserved.
+"""Copyright (c) 2024 Jonas Eschle. All rights reserved.
 
 zfit-pwa: Tools to adapt to Partial Wave Analysis packages
 """

src/zfit_pwa/compwa/variables.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Mapping
+from collections.abc import Mapping
 
 import numpy as np
 import pandas as pd
@@ -19,8 +19,9 @@ def obs_from_frame(frame1, frame2=None, bufferfactor=0.01):
     if not isinstance(frame1, (Mapping, pd.DataFrame)) or not isinstance(
         frame2, (Mapping, pd.DataFrame)
     ):
+        msg = "frame1 and frame2 have to be either a mapping or a pandas DataFrame, or a zfit Data object. They are currently of type: "
         raise ValueError(
-            "frame1 and frame2 have to be either a mapping or a pandas DataFrame, or a zfit Data object. They are currently of type: ",
+            msg,
             type(frame1),
             type(frame2),
         )
@@ -38,5 +39,4 @@ def obs_from_frame(frame1, frame2=None, bufferfactor=0.01):
                 ),
             )
         )
-    obsall = zfit.dimension.combine_spaces(*obs)
-    return obsall
+    return zfit.dimension.combine_spaces(*obs)

src/zfit_pwa/compwa/wrapper.py

@@ -51,9 +51,7 @@ def _pdf(self, x, norm):
 
     @z.function(wraps="tensorwaves")
     def _jitted_unnormalized_pdf(self, data):
-        unnormalized_pdf = self.intensity(data)
-
-        return unnormalized_pdf
+        return self.intensity(data)
 
     @z.function(wraps="tensorwaves")
     def _jitted_normalization(self, norm_sample):

tests/compwa/test_wrapper.py

@@ -39,9 +39,9 @@ def create_amplitude():
         initial_state_mass=reaction.initial_state[-1].mass,
         final_state_masses={i: p.mass for i, p in reaction.final_state.items()},
     )
-    phsp_momenta = phsp_generator.generate(100_000, rng)
+    phsp_generator.generate(100_000, rng)
 
-    unfolded_expression = model.expression.doit()
+    model.expression.doit()
 
     return model, reaction
 
@@ -93,19 +93,6 @@ def test_wrapper_simple():
     data = helicity_transformer(data_momenta)
     data_frame = pd.DataFrame(data)
     phsp_frame = pd.DataFrame(phsp)
-    initial_parameters = {
-        R"C_{J/\psi(1S) \to {f_{0}(1500)}_{0} \gamma_{+1}; f_{0}(1500) \to \pi^{0}_{0} \pi^{0}_{0}}": (
-            1.0
-        ),
-        "m_{f_{0}(500)}": 0.4,
-        "m_{f_{0}(980)}": 0.88,
-        "m_{f_{0}(1370)}": 1.22,
-        "m_{f_{0}(1500)}": 1.45,
-        "m_{f_{0}(1710)}": 1.83,
-        R"\Gamma_{f_{0}(500)}": 0.3,
-        R"\Gamma_{f_{0}(980)}": 0.1,
-        R"\Gamma_{f_{0}(1710)}": 0.3,
-    }
 
     # data conversion
     # phsp_zfit = zfit.Data.from_pandas(phsp_frame)