Merge branch 'main' into fix/install-pandoc-manually

.github/workflows/bump-version.yml

@@ -47,7 +47,7 @@ jobs:
     steps:
     # Use GitHub PAT to authenticate so other workflows trigger
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.inputs.target_branch }}
         fetch-depth: 0

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
             python-version: '3.11'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4

.github/workflows/codeql-analysis.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/dependencies-head.yml

@@ -20,7 +20,7 @@ jobs:
         python-version: ['3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
@@ -50,7 +50,7 @@ jobs:
         python-version: ['3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
@@ -80,7 +80,7 @@ jobs:
         python-version: ['3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -106,7 +106,7 @@ jobs:
         python-version: ['3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -131,7 +131,7 @@ jobs:
         python-version: ['3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
@@ -168,7 +168,7 @@ jobs:
         python-version: ['3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

.github/workflows/docker.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Prepare

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Lint Dockerfile
       uses: hadolint/[email protected]

.github/workflows/lower-bound-requirements.yml

@@ -17,7 +17,7 @@ jobs:
         python-version: ['3.8']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4

.github/workflows/merged.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Trigger Binder build
       run: |
         # Use Binder build API to trigger repo2docker to build image on Google Cloud and Turing Institute Binder Federation clusters

.github/workflows/notebooks.yml

@@ -19,7 +19,7 @@ jobs:
         python-version: ['3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python
       uses: actions/setup-python@v4

.github/workflows/publish-package.yml

@@ -29,7 +29,7 @@ jobs:
     name: Build Python distribution
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

.github/workflows/release_tests.yml

@@ -24,7 +24,7 @@ jobs:
             python-version: '3.11'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
       exclude: ^validation/|\.dtd$|\.xml$
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.0.281"
+  rev: "v0.0.287"
   hooks:
     - id: ruff
       args: ["--fix", "--show-fixes"]
@@ -38,13 +38,13 @@ repos:
     - id: black-jupyter
 
 -   repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.15.0
+    rev: 1.16.0
     hooks:
     - id: blacken-docs
       additional_dependencies: [black==23.7.0]
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.4.1
+    rev: v1.5.1
     # check the oldest and newest supported Pythons
     hooks:
       - &mypy
@@ -62,7 +62,7 @@ repos:
     rev: 1.7.0
     hooks:
     - id: nbqa-ruff
-      additional_dependencies: [ruff==0.0.281]
+      additional_dependencies: [ruff==0.0.287]
       args: ["--extend-ignore=F821,F401,F841,F811"]
 
 -   repo: https://github.com/codespell-project/codespell

src/pyhf/parameters/paramsets.py

@@ -30,7 +30,7 @@ def __init__(self, **kwargs):
 
     @property
     def suggested_fixed(self) -> List[bool]:
-        if type(self._suggested_fixed) == bool:
+        if isinstance(self._suggested_fixed, bool):
             return [self._suggested_fixed] * self.n_parameters
         return self._suggested_fixed
 
@@ -47,11 +47,9 @@ def suggested_fixed_as_bool(self) -> bool:
 
     @suggested_fixed.setter
     def suggested_fixed(self, value):
-        if type(value) == bool:
-            self._suggested_fixed = value
-        else:
+        if not isinstance(value, bool):
             assert len(value) == self.n_parameters
-            self._suggested_fixed = value
+        self._suggested_fixed = value
 
 
 class unconstrained(paramset):

src/pyhf/readxml.py

@@ -340,7 +340,9 @@ def process_measurements(
     other_parameter_configs = other_parameter_configs if other_parameter_configs else []
 
     for x in toplvl.findall('Measurement'):
-        parameter_configs_map: MutableMapping[str, Parameter] = {k['name']: dict(**k) for k in other_parameter_configs}  # type: ignore[misc]
+        parameter_configs_map: MutableMapping[str, Parameter] = {
+            k['name']: dict(**k) for k in other_parameter_configs
+        }
         lumi = float(x.attrib['Lumi'])
         lumierr = lumi * float(x.attrib['LumiRelErr'])