Merge pull request #54 from zfit/py311

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       max-parallel: 4
       fail-fast: False
       matrix:
-        python-version: [ "3.7", "3.8", "3.10" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
     name: JIT compiled tests for Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3
@@ -31,9 +31,9 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
+          pip install .[dev]
       - name: Test with pytest
         run: |
-          pip install .[dev]
           coverage run --source=. --omit=".tox/*" --branch -m pytest .
           coverage report
 
@@ -45,7 +45,7 @@ jobs:
       max-parallel: 4
       fail-fast: False
       matrix:
-        python-version: [ "3.7", "3.8", "3.10" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
     name: Eager mode tests for Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3
@@ -57,9 +57,9 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
+          pip install .[dev]
       - name: Test with pytest
         run: |
-          pip install .[dev]
           ZFIT_DO_JIT=0
           coverage run --source=. --omit=".tox/*,*/test*," --branch -m pytest .
           coverage report

.pre-commit-config.yaml

@@ -21,17 +21,11 @@ repos:
       - id: check-ast
 
   - repo: https://github.com/PyCQA/docformatter
-    rev: v1.7.3
+    rev: v1.7.5
     hooks:
       - id: docformatter
         args: [ -r, --in-place, --wrap-descriptions, '120', --wrap-summaries, '120', -- ]
 
-
-  - repo: https://github.com/mattlqx/pre-commit-sign
-    rev: v1.1.3
-    hooks:
-      - id: sign-commit
-
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:
@@ -46,26 +40,28 @@ repos:
       - id: isort
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.8.0
+    rev: v3.9.0
     hooks:
       - id: pyupgrade
-        args: [ --py37-plus ]
+        args: [ --py38-plus ]
 
   - repo: https://github.com/asottile/setup-cfg-fmt
     rev: v2.4.0
     hooks:
       - id: setup-cfg-fmt
+        args: [ --max-py-version=3.10, --include-version-classifiers ]
+
 
   # Notebook formatting
   - repo: https://github.com/nbQA-dev/nbQA
     rev: 1.7.0
     hooks:
       - id: nbqa-isort
-        additional_dependencies: [ isort==5.6.4 ]
+        additional_dependencies: [ isort ]
 
       - id: nbqa-pyupgrade
-        additional_dependencies: [ pyupgrade==2.7.4 ]
-        args: [ --py37-plus ]
+        additional_dependencies: [ pyupgrade ]
+        args: [ --py38-plus ]
 
   - repo: https://github.com/mgedmin/check-manifest
     rev: '0.49'
@@ -79,6 +75,6 @@ repos:
       args: [ '--futures=true' ]
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black

CHANGELOG.rst

@@ -26,7 +26,10 @@ Requirement changes
 
 Thanks
 ------
+0.6.0 (20 Jul 2023)
+===================
 
+Upgrade to zfit >= 0.12, support Python 3.8-3.11
 
 0.4.0 (27 Jan 2023)
 ===================

setup.cfg

@@ -9,7 +9,7 @@ author_email = zfit@physik.uzh.ch
 maintainer = zfit
 maintainer_email = zfit@physik.uzh.ch
 license = BSD-3-Clause
-license_file = LICENSE
+license_files = LICENSE
 classifiers =
     Development Status :: 3 - Alpha
     Intended Audience :: Science/Research
@@ -19,12 +19,15 @@ classifiers =
     Operating System :: Unix
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Scientific/Engineering :: Physics
 keywords = TensorFlow, model, fitting, scalable, HEP, physics
 
 [options]
-python_requires = >=3.7
+python_requires = >=3.8
 
 [bdist_wheel]
 universal = 1
@@ -38,7 +41,7 @@ exclude =
     build,
     legacy,
     utils
-max-line-length = 110
+max-line-length = 120
 statistics = True
 max-complexity = 30
 
@@ -54,4 +57,4 @@ include_trailing_comma = True
 force_grid_wrap = 0
 use_parentheses = True
 ensure_newline_before_comments = True
-line_length = 88
+line_length = 120

zfit_physics/models/pdf_kde.py

@@ -8,7 +8,7 @@
 from zfit.models.dist_tfp import WrapDistribution
 from zfit.util import ztyping
 from zfit.util.container import convert_to_container
-from zfit.util.exception import AnalyticIntegralNotImplemented, WorkInProgressError
+from zfit.util.exception import WorkInProgressError
 
 
 class GaussianKDE(WrapDistribution):  # multidimensional kde with gaussian kernel

zfit_physics/unstable/pdf.py

@@ -1,2 +1,4 @@
 from ..models.pdf_conv import NumConvPDFUnbinnedV1
 from ..models.pdf_kde import GaussianKDE
+
+__all__ = ["GaussianKDE", "NumConvPDFUnbinnedV1"]