Skip to content

Commit

Permalink
Finish 0.9.0a3
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas-eschle committed May 17, 2022
2 parents 61e46e7 + a7b81d1 commit 2ff6df9
Show file tree
Hide file tree
Showing 207 changed files with 13,350 additions and 7,492 deletions.
7 changes: 5 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
name: Bug report about: Create a report to help us improve title: ""
labels: bug assignees: ""
name: Bug report
about: Create a report to help us improve
title: ""
labels: bug
assignees: ""
---

**Bugs** Please fill the below form _if possible_.
Expand Down
7 changes: 5 additions & 2 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
name: Feature request about: Suggest an idea for this project title: ""
labels: discussion assignees: ""
name: Feature request
about: Suggest an idea for this project
title: ""
labels: discussion
assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/other.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: Other about: Anything else that does not fit the category title: ""
name: Other
about: Anything else that does not fit the category
title: ""
labels: ""
assignees: ""
---
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/physics-specific-question.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: Physics specific question about: For specific, non-public questions on physics analysis title: ""
name: Physics specific question
about: For specific, non-public questions on physics analysis
title: ""
labels: ""
assignees: ""
---
Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/zfit-usage-question.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: zfit usage question about: Questions about the usage and best ways in zfit title: "[QUESTION]"
name: zfit usage question
about: Questions about the usage and best ways in zfit
title: "[QUESTION]"
labels: ""
assignees: ""
---
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Check metadata
run: pipx run twine check dist/*

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: dist/*

Expand All @@ -38,7 +38,7 @@ jobs:
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')

steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,22 @@ jobs:
use-graph: [ 1 ] # TODO: reactivate eager, this was weirdly slow
python-version: [ 3.7, 3.8, 3.9 ]
os: [ ubuntu-latest ]
extras: [ alldev ]
include:
# - os: macos-latest
# python-version: 3.9
# use-graph: 0
- os: macos-latest
python-version: 3.9
use-graph: 1
extras: alldev-nonlinux
# - os: windows-latest
# python-version: 3.9
# use-graph: 0
- os: windows-latest
python-version: 3.9
use-graph: 1
extras: alldev-nonlinux

name: tests on ${{ matrix.os }} with ${{ matrix.python-version }} compiled = ${{ matrix.use-graph }}
# env:
Expand All @@ -53,7 +56,7 @@ jobs:
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: pip cache
uses: actions/cache@v2
uses: actions/cache@v3.0.2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}-pip-${{ hashFiles('**/requirements_dev.txt') }}-pip-${{ hashFiles('**/pyproject.toml') }}-pip-${{ hashFiles('**/setup.cfg') }}-pip-${{ hashFiles('**/setup.py') }}
Expand All @@ -63,7 +66,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --use-feature=in-tree-build .[alldev]
pip install .[${{ matrix.extras }}]
- name: Test with pytest
# TODO: how to run below on windows?
# if [[ $GITHUB_REF == 'refs/heads/develop' ]]; then
Expand Down Expand Up @@ -96,7 +99,7 @@ jobs:
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: pip cache
uses: actions/cache@v2
uses: actions/cache@v3.0.2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}-pip-${{ hashFiles('**/requirements_dev.txt') }}-pip-${{ hashFiles('**/pyproject.toml') }}-pip-${{ hashFiles('**/setup.cfg') }}-pip-${{ hashFiles('**/setup.py') }}
Expand All @@ -106,7 +109,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --use-feature=in-tree-build --ignore-requires-python .[docs]
pip install --ignore-requires-python .[docs]
- name: Build the docs, check for failure
run: |
bash utils/ci/testbuild_docs.sh
Expand Down Expand Up @@ -140,7 +143,7 @@ jobs:
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: pip cache
uses: actions/cache@v2
uses: actions/cache@v3.0.2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}-pip-${{ hashFiles('**/requirements_dev.txt') }}-pip-${{ hashFiles('**/pyproject.toml') }}-pip-${{ hashFiles('**/setup.cfg') }}-pip-${{ hashFiles('**/setup.py') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
50 changes: 16 additions & 34 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.2.0
hooks:
- id: check-added-large-files
args: [ '--maxkb=1000' ]
Expand Down Expand Up @@ -36,50 +36,34 @@ repos:
- id: docformatter
args: [ -r, --in-place, --wrap-descriptions, '120', --wrap-summaries, '120', -- ]

# - repo: https://github.com/lorman/pre-commit-rstcheck
# rev: 0decfca3d2b4f8354e84739d7e5c47a4401984d4
# hooks:
# - id: rstcheck


- 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.9.0 # Use the ref you want to point at
rev: v1.9.0
hooks:
- id: python-use-type-annotations
- id: python-check-mock-methods
- id: python-no-eval
# - id: rst-backticks
- id: rst-directive-colons

# - repo: https://github.com/pycqa/pydocstyle
# rev: 5.1.1
# hooks:
# - id: pydocstyle

# - repo: https://github.com/PyCQA/isort
# rev: 5.9.3
# hooks:
# - id: isort

- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v2.32.0
hooks:
- id: pyupgrade
args: [ --py37-plus ]

- repo: https://github.com/asottile/setup-cfg-fmt
rev: v1.20.0
rev: v1.20.1
hooks:
- id: setup-cfg-fmt
args: [--max-py-version=3.10]

# Notebook formatting
- repo: https://github.com/nbQA-dev/nbQA
rev: 1.2.2
rev: 1.3.1
hooks:
- id: nbqa-isort
additional_dependencies: [ isort==5.6.4 ]
Expand All @@ -89,7 +73,7 @@ repos:
args: [ --py37-plus ]

- repo: https://github.com/mgedmin/check-manifest
rev: '0.47'
rev: '0.48'
hooks:
- id: check-manifest
stages: [ manual ]
Expand All @@ -100,16 +84,14 @@ repos:
hooks:
- id: jupyter-notebook-cleanup

# TODO(py37): add the following once 3.6 is gone. Changes the Type hints.
# - repo: https://github.com/sondrelg/pep585-upgrade
# rev: '5f7033a0d0174c65105b041500060b993c1bc211' # Use the sha / tag you want to point at
# hooks:
# - id: upgrade-type-hints
# args: [ '--futures=true' ]
- repo: https://github.com/sondrelg/pep585-upgrade
rev: 'v1.0'
hooks:
- id: upgrade-type-hints
args: [ '--futures=true' ]

# TODO: activate once the repo is in a full state (e.g. after merging the new binned
# - repo: https://github.com/ambv/black
# rev: stable
# hooks:
# - id: black
# language_version: python3.7
- repo: https://github.com/ambv/black
rev: 22.3.0
hooks:
- id: black
language_version: python3
45 changes: 45 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,46 @@ Changelog

.. _newest-changelog:

Develop
========

0.9.0a2
========

Major Features and Improvements
-------------------------------
- improved data handling in constructors `from_pandas` (which allows now to
have weights as columns, dataframes that are a superset of the obs) and
`from_root` (obs can now be spaces and therefore cuts can be direcly applied)

Breaking changes
------------------


Deprecations
-------------

Bug fixes and small changes
---------------------------
- SimpleLoss correctly supports both functions with implicit and explicit parameters, also if they
are decorated.
- extended sampling errored for some cases of binned PDFs.
- ``ConstantParameter`` errored when converted to numpy.
- Simultaneous binned fits could error with different binning due to a missing sum over
a dimension.

Experimental
------------

Requirement changes
-------------------
- nlopt and ipyopt are now optional dependencies.

Thanks
------
- @YaniBion for discovering the bug in the extended sampling and testing the alpha release
- @ResStump for reporting the bug with the simultaneous binned fit

0.9.0a2
========

Expand Down Expand Up @@ -77,6 +117,11 @@ Thanks
------


0.8.3 (5 Apr 2022)
===================
- fixate nlopt to < 2.7.1


0.8.2 (20 Sep 2021)
====================

Expand Down
2 changes: 1 addition & 1 deletion docs/_static/css/custom.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 zfit
* Copyright (c) 2022 zfit
*/

/*pydata-sphinx-theme provides some css variables for customizing the look of the theme.*/
Expand Down
Loading

0 comments on commit 2ff6df9

Please sign in to comment.