Merge branch 'develop' into roofitcomp

zfit · Oct 12, 2024 · 1dcb476 · 1dcb476
2 parents 044f5e8 + 9ed7764
commit 1dcb476
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 43 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,58 +27,32 @@ defaults:
 
 jobs:
   tests_graph:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 150
     strategy:
-      max-parallel: 4
+      max-parallel: 16
       fail-fast: False
       matrix:
-        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
-    name: JIT compiled tests for Python ${{ matrix.python-version }}
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        python-version: [ "3.9", "3.12" ]
+        jit: [ "0", "1" ]
+    name: Tests on OS ${{ matrix.os }} with Python ${{ matrix.python-version }} and JIT ${{ matrix.jit }}
     steps:
       - uses: actions/checkout@v4
       - uses: mamba-org/setup-micromamba@v1
         name: Set up Micromamba environment
         with:
           environment-name: test-env
-          create-args: >-
-            python=${{ matrix.python-version }} pip
+          create-args: >-  # install ROOT only on non-windows. ROOT > 6.30 fails currently, and 6.30 is not available for 3.12
+            python=${{ matrix.python-version }} pip uv ${{ matrix.os != 'windows-latest' && matrix.python-version !=  '3.12' && 'root=6.30' || '' }}
       - name: Install Python dependencies
         run: |
           which python
           python -V
-          python -m pip install uv
-          python -m uv pip install -e ".[dev]"
+          uv pip install -e ".[dev]"
+          uv pip install zfit@git+https://github.com/zfit/zfit
       - name: Test with pytest
         run: |
+          ZFIT_DO_JIT=${{ matrix.jit }}
           coverage run --source=. --omit=".tox/*" --branch -m pytest .
           coverage report
-
-  tests_eager:
-    runs-on: ubuntu-latest
-    timeout-minutes: 150
-    strategy:
-      max-parallel: 4
-      fail-fast: False
-      matrix:
-        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
-    name: Eager mode tests for Python ${{ matrix.python-version }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: mamba-org/setup-micromamba@v1
-        name: Set up Micromamba environment
-        with:
-          environment-name: test-env
-          create-args: >-
-            python=${{ matrix.python-version }} pip
-      - name: Install Python dependencies
-        run: |
-          which python
-          python -V
-          python -m pip install uv
-          python -m uv pip install -e ".[dev]"
-      - name: Test with pytest
-        run: |
-          ZFIT_DO_JIT=0
-          coverage run --source=. --omit=".tox/*,*/test*," --branch -m pytest .
-          coverage report
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -24,6 +24,5 @@ sphinxcontrib-images
 sphinxcontrib-youtube>=1.0.0,<1.2.0
 tox>=2.9.1
 twine>=1.10.0
-twine
 watchdog>=0.8.3
 wheel>=0.29.0
diff --git a/setup.cfg b/setup.cfg
@@ -11,7 +11,7 @@ maintainer_email = [email protected]
 license = BSD-3-Clause
 license_files = LICENSE
 classifiers =
-    Development Status :: 3 - Alpha
+    Development Status :: 4 - Beta
     Intended Audience :: Science/Research
     License :: OSI Approved :: BSD License
     Natural Language :: English

diff --git a/setup.py b/setup.py
@@ -20,7 +20,15 @@
     install_requires=requirements,
     long_description=readme,
     include_package_data=True,
-    packages=find_packages(include=["zfit_physics", "zfit_physics.models", "zfit_physics.unstable"]),
+    packages=find_packages(
+        include=[
+            "zfit_physics",
+            "zfit_physics.models",
+            "zfit_physics.unstable",
+            "zfit_physics.pyhf",
+            "zfit_physics.roofit",
+        ]
+    ),
     test_suite="tests",
     extras_require={"dev": dev_requirements},
     use_scm_version=True,

diff --git a/zfit_physics/models/pdf_argus.py b/zfit_physics/models/pdf_argus.py
@@ -49,9 +49,9 @@ class Argus(zfit.pdf.BasePDF):
     def __init__(
         self,
         *,
-        m0,
-        c,
-        p,
+        m0: ztyping.ParamTypeInput,
+        c: ztyping.ParamTypeInput,
+        p: ztyping.ParamTypeInput,
         obs: ztyping.ObsTypeInput,
         extended: ztyping.ParamTypeInput | None = None,
         norm: ztyping.NormTypeInput = None,