From 6cebb3f92b3cb22ac211c3060caa54bc02b2313f Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Fri, 18 Aug 2023 00:01:34 -0500 Subject: [PATCH 1/3] chore: Update pyhf to v0.7.3 * Update pyhf to the latest patch release of the v0.7.x series. * Note updates in dev changelog. --- README.md | 2 +- doc/releases/changelog-dev.md | 8 +++++++- requirements.txt | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 44b985b8..05605b84 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,7 @@ The [latest release](https://github.com/MadAnalysis/madanalysis5/releases) of Ma - [FastJet](http://fastjet.fr) v3.3.3 - [Delphes](https://github.com/delphes/delphes) v3.5.0 - [ROOT](https://root.cern) v6.04.08 -- [pyhf](https://github.com/scikit-hep/pyhf) v0.7.0 +- [pyhf](https://github.com/scikit-hep/pyhf) v0.7.3 ### Authors diff --git a/doc/releases/changelog-dev.md b/doc/releases/changelog-dev.md index a60fbbba..733300f8 100644 --- a/doc/releases/changelog-dev.md +++ b/doc/releases/changelog-dev.md @@ -4,8 +4,14 @@ ## Improvements +* The required version of pyhf was updated to v0.7.3 to take advantage of recent + edge case bug fixes. +([#211](https://github.com/MadAnalysis/madanalysis5/pull/211)) + ## Bug fixes ## Contributors -This release contains contributions from (in alphabetical order): \ No newline at end of file +This release contains contributions from (in alphabetical order): + +[Matthew Feickert](https://github.com/matthewfeickert) diff --git a/requirements.txt b/requirements.txt index 6cdc39b2..3662162c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ matplotlib>=3.4.2 scipy>=1.7.1 numpy>=1.19.5 -pyhf==0.7.0 +pyhf==0.7.3 lxml>=4.6.2 From 326f19dd2822e7a9e44183678aef3f7fbf743225 Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Fri, 18 Aug 2023 09:43:04 +0100 Subject: [PATCH 2/3] move changelog to v1.10 --- doc/releases/changelog-dev.md | 6 ------ doc/releases/changelog-v1.10.md | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/releases/changelog-dev.md b/doc/releases/changelog-dev.md index 733300f8..9400eed3 100644 --- a/doc/releases/changelog-dev.md +++ b/doc/releases/changelog-dev.md @@ -4,14 +4,8 @@ ## Improvements -* The required version of pyhf was updated to v0.7.3 to take advantage of recent - edge case bug fixes. -([#211](https://github.com/MadAnalysis/madanalysis5/pull/211)) - ## Bug fixes ## Contributors This release contains contributions from (in alphabetical order): - -[Matthew Feickert](https://github.com/matthewfeickert) diff --git a/doc/releases/changelog-v1.10.md b/doc/releases/changelog-v1.10.md index 87821b55..a6276d76 100644 --- a/doc/releases/changelog-v1.10.md +++ b/doc/releases/changelog-v1.10.md @@ -62,6 +62,10 @@ * More digits have been added to the CLs output file. ([#194](https://github.com/MadAnalysis/madanalysis5/pull/194)) +* The required version of pyhf was updated to v0.7.3 to take advantage of recent + edge case bug fixes. + ([#211](https://github.com/MadAnalysis/madanalysis5/pull/211)) + ## Bug fixes * Zero division error fixed in the simplified likelihoods workflow. @@ -132,4 +136,5 @@ This release contains contributions from (in alphabetical order): [Jack Y. Araz](https://github.com/jackaraz), [Kyle Fan](https://github.com/kfan326), +[Matthew Feickert](https://github.com/matthewfeickert), [Benjamin Fuks](https://github.com/bfuks) From 66fa736d22563c53aace39b25680b1ef96c2b291 Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Fri, 18 Aug 2023 09:45:07 +0100 Subject: [PATCH 3/3] update version --- bin/ma5 | 4 ++-- tools/SampleAnalyzer/Commons/Base/Configuration.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/ma5 b/bin/ma5 index 9917a473..e523f9bf 100755 --- a/bin/ma5 +++ b/bin/ma5 @@ -68,8 +68,8 @@ sys.path.insert(0, servicedir) # Release version # Do not touch it !!!!! -version = "1.10.10" -date = "2023/05/24" +version = "1.10.11" +date = "2023/08/18" # Loading the MadAnalysis session import madanalysis.core.launcher diff --git a/tools/SampleAnalyzer/Commons/Base/Configuration.cpp b/tools/SampleAnalyzer/Commons/Base/Configuration.cpp index 26d4a778..772a65ef 100644 --- a/tools/SampleAnalyzer/Commons/Base/Configuration.cpp +++ b/tools/SampleAnalyzer/Commons/Base/Configuration.cpp @@ -40,8 +40,8 @@ using namespace MA5; // Initializing static data members // ----------------------------------------------------------------------------- // DO NOT TOUCH THESE LINES -const std::string Configuration::sampleanalyzer_version_ = "1.10.10"; -const std::string Configuration::sampleanalyzer_date_ = "2023/05/24"; +const std::string Configuration::sampleanalyzer_version_ = "1.10.11"; +const std::string Configuration::sampleanalyzer_date_ = "2023/08/18"; // DO NOT TOUCH THESE LINES // -----------------------------------------------------------------------------