Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: pyhf 0.7 compatibility #301

Merged
merged 7 commits into from
Jul 30, 2022
Merged

fix: pyhf 0.7 compatibility #301

merged 7 commits into from
Jul 30, 2022

Conversation

alexander-held
Copy link
Member

@alexander-held alexander-held commented Oct 18, 2021

This updates cabinetry to be compatible with the upcoming pyhf version 0.7.0, and with the existing 0.7.0rc1.

scikit-hep/pyhf#1625 changed the order of model parameters, so the tests are updated to work with the new parameter order.

scikit-hep/pyhf#1639 changed paramset.suggested_fixed, the previous functionality is now achieved via suggested_fixed_as_bool.

CI temporarily failed due to changes in scikit-hep/pyhf#1639 that affect the model.config.suggested_fixed API return types, see scikit-hep/pyhf#1701 for details. Fixed via scikit-hep/pyhf#1706.

Integration test tolerances are slightly relaxed due to small differences seen between different local setups (see also #318).

resolves #340 (nothing in particular needed in this PR to achieve that, but pyhf 0.7 will resolve #340 so that problem will disappear within cabinetry as well after this PR)

resolves #344

* updated parameter order in tests to match order in pyhf 0.7.0
* adopted new paramset.suggested_fixed_as_bool API

@codecov
Copy link

codecov bot commented Oct 18, 2021

Codecov Report

Merging #301 (e2b42a6) into master (598c06c) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##            master      #301   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           23        23           
  Lines         1876      1876           
  Branches       298       298           
=========================================
  Hits          1876      1876           
Impacted Files Coverage Δ
src/cabinetry/model_utils.py 100.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 598c06c...e2b42a6. Read the comment docs.

@alexander-held alexander-held merged commit ba834d2 into master Jul 30, 2022
@alexander-held alexander-held deleted the fix/pyhf-070 branch July 30, 2022 15:50
@alexander-held
Copy link
Member Author

The last piece of pyhf 0.7 API compatibility, model.config.par_names, was added in #367.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't install latest cabinetry on top of pyhf master (or pyhf 0.7.0.rc1) Error when changing bins in VR
1 participant