try to test root with 3.12 as well

zfit · Sep 7, 2024 · a266a01 · a266a01
1 parent 92dc891
commit a266a01
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,14 +42,13 @@ jobs:
         with:
           environment-name: test-env
           create-args: >-
-            python=${{ matrix.python-version }} pip ${{ matrix.python-version != '3.12' && 'root' || '' }}
+            python=${{ matrix.python-version }} pip root
       - name: Install Python dependencies
         run: |
           which python
           python -V
           python -m pip install uv
           python -m uv pip install -e ".[dev]"
-          python -m uv pip install git+https://github.com/HDembinski/numba-stats.git
       - name: Test with pytest
         run: |
           coverage run --source=. --omit=".tox/*" --branch -m pytest .
@@ -71,14 +70,13 @@ jobs:
         with:
           environment-name: test-env
           create-args: >-
-            python=${{ matrix.python-version }} pip ${{ matrix.python-version != '3.12' && 'root' || '' }}
+            python=${{ matrix.python-version }} pip root
       - name: Install Python dependencies
         run: |
           which python
           python -V
           python -m pip install uv
           python -m uv pip install -e ".[dev]"
-          python -m uv pip install git+https://github.com/HDembinski/numba-stats.git
       - name: Test with pytest
         run: |
           ZFIT_DO_JIT=0

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -4,7 +4,7 @@ coverage>=4.5.1
 flake8>=3.5.0
 jupyter-sphinx
 myst-nb
-numba-stats  # hack for pypi release, doesn't allow git repos @ git+https://github.com/HDembinski/numba-stats.git  # CMSShape not yet released (expected 1.8.0)
+numba-stats
 pip>=9.0.1
 pre-commit
 pydata-sphinx-theme>=0.9  # new dark theme configuration

diff --git a/tests/test_pdf_novosibirsk.py b/tests/test_pdf_novosibirsk.py
@@ -2,6 +2,7 @@
 
 import numpy as np
 import pytest
+import ROOT
 import tensorflow as tf
 import zfit
 from zfit.core.testing import tester
@@ -27,7 +28,6 @@ def create_novosibirsk(mu, sigma, lambd, limits):
 
 @pytest.mark.skip
 def create_and_eval_root_novosibirsk_and_integral(mu, sigma, lambd, limits, x, lower, upper):
-    ROOT = pytest.importorskip("ROOT")
     obs = ROOT.RooRealVar("obs", "obs", *limits)
     peak = ROOT.RooRealVar("peak", "peak", mu)
     width = ROOT.RooRealVar("width", "width", sigma)