From 6e942a9754e076f9253cdc4591757021253ab406 Mon Sep 17 00:00:00 2001
From: Jonas Eschle <mayou36@jonas.eschle.com>
Date: Fri, 11 Oct 2024 22:48:59 -0400
Subject: [PATCH] Refactor: Ensure params are numpy arrays in nll_func

---
 .github/workflows/ci.yml | 43 ++++++++--------------------------------
 .pre-commit-config.yaml  | 10 +++++-----
 requirements_dev.txt     |  1 -
 setup.cfg                |  2 +-
 setup.py                 |  4 +++-
 5 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad3c939..0ae22e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,14 +27,16 @@ 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 for Python ${{ matrix.python-version }} with JIT=${{ matrix.jit }}
     steps:
       - uses: actions/checkout@v4
       - uses: mamba-org/setup-micromamba@v1
@@ -42,43 +44,14 @@ jobs:
         with:
           environment-name: test-env
           create-args: >-
-            python=${{ matrix.python-version }} pip
+            python=${{ matrix.python-version }} pip uv root
       - 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=${{ 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/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1199eef..e93f576 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,11 +20,11 @@ repos:
       - id: fix-byte-order-marker
       - id: check-ast
 
-  - repo: https://github.com/PyCQA/docformatter
-    rev: v1.7.5
-    hooks:
-      - id: docformatter
-        args: [ -r, --in-place, --wrap-descriptions, '120', --wrap-summaries, '120', -- ]
+#  - repo: https://github.com/PyCQA/docformatter
+#    rev: v1.7.5
+#    hooks:
+#      - id: docformatter
+#        args: [ -r, --in-place, --wrap-descriptions, '120', --wrap-summaries, '120', -- ]
 
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
diff --git a/requirements_dev.txt b/requirements_dev.txt
index de82233..423bec5 100644
--- 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
index 0959518..c58c207 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,7 @@ maintainer_email = zfit@physik.uzh.ch
 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
index 25d9a02..4b8b209 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,9 @@
     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"]
+    ),
     test_suite="tests",
     extras_require={"dev": dev_requirements},
     use_scm_version=True,