Merge pull request #17 from SpeysideHEP/bugfix_patchmaker

[Bug] Issue with the patch maker

.zenodo.json

@@ -1,8 +1,8 @@
 {
     "description": "pyhf plug-in for spey package",
     "license": "MIT",
-    "title": "SpeysideHEP/spey-pyhf: v0.1.9",
-    "version": "v0.1.9",
+    "title": "SpeysideHEP/spey-pyhf: v0.1.10",
+    "version": "v0.1.10",
     "upload_type": "software",
     "creators": [
         {
@@ -29,7 +29,7 @@
         },
         {
             "scheme": "url",
-            "identifier": "https://github.com/SpeysideHEP/spey-pyhf/tree/v0.1.9",
+            "identifier": "https://github.com/SpeysideHEP/spey-pyhf/tree/v0.1.10",
             "relation": "isSupplementTo"
         },
         {

CONTRIBUTING.md

@@ -24,13 +24,12 @@ description and the benefits of the implementation.
 Here are the steps to follow to make a pull request:
 
 1. Fork the `spey-pyhf` repository.
-2. Open an issue and discuss the implementation with the developers.
-3. Commit your changes to a feature branch on your fork and push all your
-   changes there.
-4. Start a draft pull request and let the developers know about your
-   progress.
-5. Pull the main branch to make sure that there is no
-   conflict with the current developments of the code.
-6. Make sure that you modified appropriate section of
+2. Install pre-commit using `pip install pre-commit`
+3. Go to `spey-pyhf` main folder and type `pre-commit install`.
+4. Open an issue and discuss the implementation with the developers.
+5. Commit your changes to a feature branch on your fork and push all your changes.
+6. Start a draft pull request and inform the developers about your progress.
+7. Pull the ``main`` branch to ensure there are no conflicts with the current code developments.
+8. Modify the appropriate section of
    `docs/releases/changelog-dev.md`.
-7. Once you are done, request one of the maintainers to review your PR.
+9. Once complete, request a review from one of the maintainers.

docs/releases/changelog-v0.1.md

@@ -48,6 +48,9 @@
 * Issue with implementing removed channels to the patch
   ([#16](https://github.com/SpeysideHEP/spey-pyhf/pull/16))
 
+* Issue with the sorting of the removed channels.
+  ([#17](https://github.com/SpeysideHEP/spey-pyhf/pull/17))
+
 ## Contributors
 
 This release contains contributions from (in alphabetical order):

setup.py

@@ -6,7 +6,7 @@
 with open("src/spey_pyhf/_version.py", encoding="UTF-8") as f:
     version = f.readlines()[-1].split()[-1].strip("\"'")
 
-requirements = ["pyhf==0.7.6", "spey>=0.1.9"]
+requirements = ["pyhf==0.7.6", "spey>=0.1.11"]
 
 docs = [
     "sphinx==6.2.1",

src/spey_pyhf/_version.py

@@ -1,3 +1,3 @@
 """Version of the spey - pyhf plugin"""
 
-__version__ = "0.1.9"
+__version__ = "0.1.10"

src/spey_pyhf/helper_functions.py

@@ -240,7 +240,7 @@ def make_patch(self) -> List[Dict]:
             else:
                 log.warning(f"Undefined channel in the patch set: {channel}")
 
-        to_remove.sort(key=lambda p: p["path"].split("/")[-1], reverse=True)
+        to_remove.sort(key=lambda p: int(p["path"].split("/")[-1]), reverse=True)
 
         return patch + to_remove